aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2003-05-02 11:07:58 +0000
committerDoug Barton <dougb@FreeBSD.org>2003-05-02 11:07:58 +0000
commit6203d02c6aa48cb975c061343d9e80e7f8b04b73 (patch)
tree769a292e245a41a6f648a29c58acafa50629a9c5 /usr.sbin/mergemaster
parent0bbed97c5c2b605b88bc30bd88cb826d05062ba3 (diff)
Notes
Diffstat (limited to 'usr.sbin/mergemaster')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 7125b8d1762bb..b444023068acb 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -609,7 +609,7 @@ CONFIRMED_UMASK=${NEW_UMASK:-0022}
# Warn users who still have old rc files
#
for file in atm devfs diskless1 diskless2 isdn network network6 pccard \
- sendmail serial syscons sysctl alpha amd64 i386 ia64 sparc64; do
+ serial syscons sysctl alpha amd64 i386 ia64 sparc64; do
if [ -f "${DESTDIR}/etc/rc.${file}" ]; then
OLD_RC_PRESENT=1
break
@@ -635,7 +635,7 @@ case "${OLD_RC_PRESENT}" in
*)
mkdir -p /var/tmp/mergemaster/old_rc
for file in atm devfs diskless1 diskless2 isdn network network6 pccard \
- sendmail serial syscons sysctl alpha amd64 i386 ia64 sparc64; do
+ serial syscons sysctl alpha amd64 i386 ia64 sparc64; do
if [ -f "${DESTDIR}/etc/rc.${file}" ]; then
mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/
fi