d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences in

Browse Source 
the FreeBSD default motd and the system motd

Submitted by:	author
This commit is contained in:
Bill Fumerola 1999-10-26 19:06:31 +00:00
parent 5edab78fb5
commit 256d3d1de0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=52534
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/mergemaster/mergemaster
View File

@ -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 ''

2
usr.sbin/mergemaster/mergemaster.8
View File

@ -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 ,

8
usr.sbin/mergemaster/mergemaster.sh
View File

@ -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 ''