diff options
author | dougb <dougb@FreeBSD.org> | 2010-01-15 03:56:48 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2010-01-15 03:56:48 +0000 |
commit | 5f27710b2ba2273f51281e5a9c75437d8739a5ed (patch) | |
tree | bfb1159a177aaef5b35a380b0cea35fdf3881858 /usr.sbin/mergemaster | |
parent | 2bffa8c7ba63face9a0759d932b37a9a92fa70e1 (diff) | |
download | FreeBSD-src-5f27710b2ba2273f51281e5a9c75437d8739a5ed.zip FreeBSD-src-5f27710b2ba2273f51281e5a9c75437d8739a5ed.tar.gz |
Now that we've officially arrived at FreeBSD 9, remove the IGNORE_MOTD
compat shim as advertised. This change should not be MFC'ed.
Diffstat (limited to 'usr.sbin/mergemaster')
-rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 1b0753b..a723214 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -651,17 +651,14 @@ case "${RERUN}" in ;; esac - # Avoid comparing the motd if the user specifies it in .mergemasterrc - # Compatibility shim to be removed in FreeBSD 9.x case "${IGNORE_MOTD}" in - '') ;; - *) IGNORE_FILES="${IGNORE_FILES} /etc/motd" + *) echo '' echo "*** You have the IGNORE_MOTD option set in your mergemaster rc file." echo " This option is deprecated in favor of the IGNORE_FILES option." echo " Please update your rc file accordingly." echo '' - press_to_continue + exit 1 ;; esac |