From 705b2d53896fb37e49ae8e80ee3177fa1bad4f1e Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 15 Jan 2010 03:56:48 +0000
Subject: [PATCH] Now that we've officially arrived at FreeBSD 9, remove the
 IGNORE_MOTD compat shim as advertised. This change should not be MFC'ed.

---
 usr.sbin/mergemaster/mergemaster.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 1b0753b8925d..a723214710af 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