diff options
| author | dougb <dougb@FreeBSD.org> | 2003-05-02 11:07:58 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2003-05-02 11:07:58 +0000 |
| commit | 78f557b9c890e72abae01c074f97679116fe3bfd (patch) | |
| tree | 769a292e245a41a6f648a29c58acafa50629a9c5 /usr.sbin/mergemaster | |
| parent | 25b63e09320346dcc9a4f1c0b6f55b0710e0a424 (diff) | |
| download | FreeBSD-src-78f557b9c890e72abae01c074f97679116fe3bfd.zip FreeBSD-src-78f557b9c890e72abae01c074f97679116fe3bfd.tar.gz | |
rc.sendmail should not have been removed yet.
Don't include it in the rcOG removal prompt.
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 7125b8d..b444023 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 |
