diff options
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 e21d466..91d964e 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -670,7 +670,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 \ +for file in atm devfs diskless1 diskless2 network network6 pccard \ serial syscons sysctl alpha amd64 i386 ia64 sparc64; do if [ -f "${DESTDIR}/etc/rc.${file}" ]; then OLD_RC_PRESENT=1 @@ -696,7 +696,7 @@ case "${OLD_RC_PRESENT}" in [nN]*) ;; *) mkdir -p /var/tmp/mergemaster/old_rc - for file in atm devfs diskless1 diskless2 isdn network network6 pccard \ + for file in atm devfs diskless1 diskless2 network network6 pccard \ 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/ |
