diff options
| author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.sbin/mergemaster | |
| parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
| parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
| download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz | |
Merge head from 7/28
Diffstat (limited to 'usr.sbin/mergemaster')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 2 | ||||
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 1cff984..c3e22a0 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -473,4 +473,4 @@ temporary root environment comes from Nik Clayton's make world tutorial which is referenced above. .Sh AUTHORS This manual page and the script itself were written by -.An Douglas Barton Aq dougb@FreeBSD.org . +.An Douglas Barton Aq Mt dougb@FreeBSD.org . diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index a200088..9bf4f9f 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -760,7 +760,7 @@ CONFIRMED_UMASK=${NEW_UMASK:-0022} # Warn users who still have old rc files # for file in atm devfs diskless1 diskless2 network network6 pccard \ - serial syscons sysctl alpha amd64 i386 ia64 sparc64; do + serial syscons sysctl alpha amd64 i386 sparc64; do if [ -f "${DESTDIR}/etc/rc.${file}" ]; then OLD_RC_PRESENT=1 break @@ -786,7 +786,7 @@ case "${OLD_RC_PRESENT}" in *) mkdir -p /var/tmp/mergemaster/old_rc for file in atm devfs diskless1 diskless2 network network6 pccard \ - serial syscons sysctl alpha amd64 i386 ia64 sparc64; do + serial syscons sysctl alpha amd64 i386 sparc64; do if [ -f "${DESTDIR}/etc/rc.${file}" ]; then mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/ fi |
