Changeset bd1b5be

Timestamp:

05/14/2011 06:46:00 PM (13 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

dad97de

Parents:

34a7193

Message:

Added FAILURE_ACTION variable to rc.site

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

Location:

bootscripts/contrib/lsb-v3

Files:

• ChangeLog (modified) (1 diff)
• init.d/checkfs (modified) (3 diffs)
• init.d/udev (modified) (2 diffs)
• sysconfig/rc.site (modified) (3 diffs)

bootscripts/contrib/lsb-v3/ChangeLog

@@ -1 +1 @@
 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]

bootscripts/contrib/lsb-v3/init.d/checkfs

@@ -36 +36 @@
             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
@@ -72 +72 @@
             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
@@ -85 +85 @@
             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

bootscripts/contrib/lsb-v3/init.d/udev

@@ -30 +30 @@
                         boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
                         boot_mesg "" ${NORMAL}
-                        read ENTER
+                        $FAILURE_ACTION
                         /etc/rc.d/init.d/halt stop
                 fi
@@ -49 +49 @@
                         boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
                         boot_mesg "" ${NORMAL}
-                        read ENTER
+                        $FAILURE_ACTION
                         /etc/rc.d/init.d/halt stop
                 fi

bootscripts/contrib/lsb-v3/sysconfig/rc.site

@@ -13 +13 @@
 # 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
@@ -34 +38 @@
 # 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
@@ -65 +70 @@
     echo -e "${INFO}Press Enter to continue..."
     echo -e "${NORMAL}"
-    read ENTER
+    $FAILURE_ACTION
 }