Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences in
the FreeBSD default motd and the system motd Submitted by: author
This commit is contained in:
parent
5edab78fb5
commit
256d3d1de0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=52534
@ -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 ''
|
||||
|
||||
|
@ -231,6 +231,8 @@ with all values commented out:
|
||||
#DONT_CHECK_PAGER=
|
||||
# If you set 'yes' above, make sure to include the PATH to your pager
|
||||
#PATH=/bin:/usr/bin:/usr/sbin
|
||||
# Don't compare the old and new motd files
|
||||
#IGNORE_MOTD=yes
|
||||
.Ed
|
||||
.Sh SEE ALSO
|
||||
.Xr cvs 1 ,
|
||||
|
@ -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 ''
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user