Added FAILURE_ACTION variable to rc.site

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9526 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

4 files changed, 15 insertions, 6 deletions

diff --git a/bootscripts/contrib/lsb-v3/ChangeLog b/bootscripts/contrib/lsb-v3/ChangeLog
index b9a1a91cd..94e7f0e86 100644
--- a/bootscripts/contrib/lsb-v3/ChangeLog
+++ b/bootscripts/contrib/lsb-v3/ChangeLog
@@ -1,5 +1,9 @@
 ChangeLog
 
+20110514 - [dj]
+	* Added FAILURE_ACTION variable to rc.site for use in remote systems
+          where user input is not appropriate in the event of a failure
+
 20110424 - [dj]
         * Sync to LFS-Bootscripts-20110424 (move new run mounts and
           symlinks [bdubbs]).
diff --git a/bootscripts/contrib/lsb-v3/init.d/checkfs b/bootscripts/contrib/lsb-v3/init.d/checkfs
index 4718a49a3..599e2cbc6 100644
--- a/bootscripts/contrib/lsb-v3/init.d/checkfs
+++ b/bootscripts/contrib/lsb-v3/init.d/checkfs
@@ -35,7 +35,7 @@ case "${1}" in
             echo -e -n "${FAILURE}After you press Enter, this system will be "
             echo -e "${FAILURE}halted and powered off.\n"
             echo -e "${INFO}Press enter to continue...${NORMAL}"
-            read ENTER
+            $FAILURE_ACTION
             /etc/rc.d/init.d/halt stop
         fi
 
@@ -71,7 +71,7 @@ case "${1}" in
             echo -e "${WARNING}this system to be rebooted.\n"
             echo -e "After you press enter, this system will be rebooted.\n"
             echo -e "${INFO}Press Enter to continue...${NORMAL}"
-            read ENTER
+            $FAILURE_ACTION
             reboot -f
         elif [ "${error_value}" -gt 3 -a "${error_value}" -lt 16 ]; then
             log_failure_msg "Checking file systems..."
@@ -84,7 +84,7 @@ case "${1}" in
             echo -e "${FAILURE}After you press Enter, this system will be"
             echo -e "${FAILURE}halted and powered off.\n"
             echo -e "${INFO}Press Enter to continue...${NORMAL}"
-            read ENTER
+            $FAILURE_ACTION
             /etc/rc.d/init.d/halt stop
         elif [ "${error_value}" -ge 16 ]; then
             log_failure_msg "Checking file systems..."
diff --git a/bootscripts/contrib/lsb-v3/init.d/udev b/bootscripts/contrib/lsb-v3/init.d/udev
index 0325b3505..ac91fccf3 100644
--- a/bootscripts/contrib/lsb-v3/init.d/udev
+++ b/bootscripts/contrib/lsb-v3/init.d/udev
@@ -29,7 +29,7 @@ case "${1}" in
 			boot_mesg -n " will be halted and powered off."
 			boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
 			boot_mesg "" ${NORMAL}
-			read ENTER
+			$FAILURE_ACTION
 			/etc/rc.d/init.d/halt stop
 		fi
 
@@ -48,7 +48,7 @@ case "${1}" in
 			boot_mesg -n " will be halted and powered off."
 			boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
 			boot_mesg "" ${NORMAL}
-			read ENTER
+			$FAILURE_ACTION
 			/etc/rc.d/init.d/halt stop
 		fi
 
diff --git a/bootscripts/contrib/lsb-v3/sysconfig/rc.site b/bootscripts/contrib/lsb-v3/sysconfig/rc.site
index cf58e2fd7..63ef59096 100644
--- a/bootscripts/contrib/lsb-v3/sysconfig/rc.site
+++ b/bootscripts/contrib/lsb-v3/sysconfig/rc.site
@@ -13,6 +13,10 @@ TEMPFS_MOUNT="${RC_BASE}/init.d/boottemp"
 # Bootlogging (requires a tempfs mount)
 BOOTLOG_ENAB="yes"
 
+# Manual input is not appropriate on remote systems. Define what happens when
+# an error is encountered that interupts the boot/shutdown proceess
+FAILURE_ACTION="read ENTER"
+
 # Distro Information
 DISTRO="Linux From Scratch" # The distro name
 DISTRO_CONTACT="lfs-dev@linuxfromscratch.org" # Bug report address
@@ -33,6 +37,7 @@ PREFIX_FAILURE="${FAILURE}***${NORMAL}"
 
 # Export varialbles so that they are inherited by the initscripts
 export RC_BASE RC_FUNCTIONS NETWORK_DEVICES TEMPFS_MOUNT BOOTLOG_ENAB
+export FAILURE_ACTION
 export DISTRO DISTRO_CONTACT DISTRO_MINI
 export BRACKET FAILURE INFO NORMAL SUCCESS WARNING
 export PREFIX_SUCCESS PREFIX_WARNING PREFIX_FAILURE
@@ -64,6 +69,6 @@ print_error_msg()
     echo -e ""
     echo -e "${INFO}Press Enter to continue..."
     echo -e "${NORMAL}"
-    read ENTER
+    $FAILURE_ACTION
 }