diff options
| author | DJ Lucas <dj@linuxfromscratch.org> | 2011-05-23 05:07:21 +0000 |
|---|---|---|
| committer | DJ Lucas <dj@linuxfromscratch.org> | 2011-05-23 05:07:21 +0000 |
| commit | f3f65e73a3e8e1b7d925be3ee6b0e40b03252804 (patch) | |
| tree | 062eb7b4c317aca93cbedd8fe29ef63d971468ef /lsb-bootscripts/etc/default | |
| parent | 90b457477d7909f501615eec5a18efd29944298a (diff) | |
Added stop_on_error parameter to rc.site and cleaned up Begin and End lines.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9552 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'lsb-bootscripts/etc/default')
| -rw-r--r-- | lsb-bootscripts/etc/default/rc | 15 | ||||
| -rw-r--r-- | lsb-bootscripts/etc/default/rc.site | 16 |
2 files changed, 22 insertions, 9 deletions
diff --git a/lsb-bootscripts/etc/default/rc b/lsb-bootscripts/etc/default/rc index 4b756c54f..f821de9c4 100644 --- a/lsb-bootscripts/etc/default/rc +++ b/lsb-bootscripts/etc/default/rc @@ -1,8 +1,5 @@ # Begin /etc/default/rc -# Author: DJ Lucas - dj@linuxfromscratch.org -# Version: 1.0 LSB V.3.1 - # Global variable inherited by initscripts are in caps # Local variables for the rc script are in lowercase @@ -10,7 +7,7 @@ . /etc/default/rc.site # Set base directory information -RC_BASE="ETCDIR" +RC_BASE="/etc/rc.d" # Location of network device scripts and config files NETWORK_DEVICES="/etc/network" @@ -74,6 +71,16 @@ ilen="38" # The total length of the interactive message welcome_message="Welcome to ${INFO}${DISTRO}${NORMAL}" i_message="Press '${FAILURE}I${NORMAL}' to enter interactive startup" +# FAILURE_ACTION (what to do when script failure occurs) +case "${stop_on_error}" in + Y* | y* | 0) + FAILURE_ACTION='read Enter' + ;; + *) + FAILURE_ACTION='echo ""' + ;; +esac + # Error message displayed when a script's exit value is not zero print_error_msg() { diff --git a/lsb-bootscripts/etc/default/rc.site b/lsb-bootscripts/etc/default/rc.site index 34f25cc79..1e77b942d 100644 --- a/lsb-bootscripts/etc/default/rc.site +++ b/lsb-bootscripts/etc/default/rc.site @@ -1,3 +1,8 @@ +# Begin /etc/default/rc.site + +# Global variable inherited by initscripts are in caps +# Local variables for the rc script are in lowercase + # Bootlogging (requires a tempfs mount) BOOTLOG_ENAB="yes" @@ -8,14 +13,15 @@ HOSTNAME=<lfs> UTC=1 CLOCKPARAMS= -# 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" - # Export varialbles so that they are inherited by the initscripts -export BOOTLOG_ENAB HOSTNAME UTC CLOCKPARAMS FAILURE_ACTION +export BOOTLOG_ENAB HOSTNAME UTC CLOCKPARAMS # Interactive startup iprompt="yes" # Wether to display the interactive boot promp itime="2" # The ammount of time (in seconds) to display the prompt +# Manual input is not appropriate on remote systems. Wait for user input on +# script error? +stop_on_error="yes" + +# End /etc/default/rc.site |