summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster8
-rw-r--r--usr.sbin/mergemaster/mergemaster.82
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh8
3 files changed, 18 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster b/usr.sbin/mergemaster/mergemaster
index 6fcf752..330db74 100755
--- a/usr.sbin/mergemaster/mergemaster
+++ b/usr.sbin/mergemaster/mergemaster
@@ -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 ''
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 0c88dd6..d0dee82 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -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 ,
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 ''
OpenPOWER on IntegriCloud