diff options
author | billf <billf@FreeBSD.org> | 1999-10-26 19:06:31 +0000 |
---|---|---|
committer | billf <billf@FreeBSD.org> | 1999-10-26 19:06:31 +0000 |
commit | 66863f71cdd5485781eb4099007348a4b90d88e7 (patch) | |
tree | f35e3bee06d4afab5f86051c54a86f803670c85d /usr.sbin/mergemaster/mergemaster.sh | |
parent | e55279d058091b8abbe23a7bb636f9ee58110824 (diff) | |
download | FreeBSD-src-66863f71cdd5485781eb4099007348a4b90d88e7.zip FreeBSD-src-66863f71cdd5485781eb4099007348a4b90d88e7.tar.gz |
Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences in
the FreeBSD default motd and the system motd
Submitted by: author
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.sh')
-rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 6fcf752..330db74 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -253,6 +253,13 @@ case "${RERUN}" in # rm ${TEMPROOT}/etc/spwd.db ${TEMPROOT}/etc/passwd ${TEMPROOT}/etc/pwd.db + # Avoid comparing the motd if the user specifies it in .mergemasterrc + case "${IGNORE_MOTD}" in + '') ;; + *) rm ${TEMPROOT}/etc/motd + ;; + esac + ;; # End of the "RERUN" test esac @@ -607,6 +614,7 @@ for COMPFILE in `find . -type f -size +0`; do fi # Yes, the file still remains to be checked done # This is for the do way up there at the beginning of the comparison +echo '' echo "*** Comparison complete" echo '' |