Author: dj
Date: 2011-05-22 23:07:21 -0600 (Sun, 22 May 2011)
New Revision: 9552
Modified:
trunk/BOOK/lsb-bootscripts/ChangeLog
trunk/BOOK/lsb-bootscripts/etc/default/rc
trunk/BOOK/lsb-bootscripts/etc/default/rc.site
trunk/BOOK/lsb-bootscripts/etc/init.d/checkfs
trunk/BOOK/lsb-bootscripts/etc/init.d/cleanfs
trunk/BOOK/lsb-bootscripts/etc/init.d/console
trunk/BOOK/lsb-bootscripts/etc/init.d/halt
trunk/BOOK/lsb-bootscripts/etc/init.d/localnet
trunk/BOOK/lsb-bootscripts/etc/init.d/modules
trunk/BOOK/lsb-bootscripts/etc/init.d/mountfs
trunk/BOOK/lsb-bootscripts/etc/init.d/mountvirtfs
trunk/BOOK/lsb-bootscripts/etc/init.d/network
trunk/BOOK/lsb-bootscripts/etc/init.d/reboot
trunk/BOOK/lsb-bootscripts/etc/init.d/sendsignals
trunk/BOOK/lsb-bootscripts/etc/init.d/setclock
trunk/BOOK/lsb-bootscripts/etc/init.d/swap
trunk/BOOK/lsb-bootscripts/etc/init.d/sysctl
trunk/BOOK/lsb-bootscripts/etc/init.d/sysklogd
trunk/BOOK/lsb-bootscripts/etc/init.d/template
trunk/BOOK/lsb-bootscripts/etc/init.d/udev
trunk/BOOK/lsb-bootscripts/etc/init.d/udev_retry
Log:
Added stop_on_error parameter to rc.site and cleaned up Begin and End lines.
Modified: trunk/BOOK/lsb-bootscripts/ChangeLog
===================================================================
--- trunk/BOOK/lsb-bootscripts/ChangeLog 2011-05-23 03:43:35 UTC (rev
9551)
+++ trunk/BOOK/lsb-bootscripts/ChangeLog 2011-05-23 05:07:21 UTC (rev
9552)
@@ -4,6 +4,9 @@
symlink if ETCDIR is not /etc.
* Makefile, etc/inittab: Removed the installation of /etc/inittab as this is
done in the book.
+ * etc/default/rc, etc/default/rc.site: Added "stop_on_error" parameter to
+ rc.site file and added testcase on "stop_on_error" for FAILURE_ACTION in
+ rc file.
2011-05-21 DJ Lucas <[email protected]>
* lib/lsb/init-functions: Merged the contents of etc/init.d/lfs-functions and
Modified: trunk/BOOK/lsb-bootscripts/etc/default/rc
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/default/rc 2011-05-23 03:43:35 UTC (rev
9551)
+++ trunk/BOOK/lsb-bootscripts/etc/default/rc 2011-05-23 05:07:21 UTC (rev
9552)
@@ -1,8 +1,5 @@
# Begin /etc/default/rc
-# Author: DJ Lucas - [email protected]
-# 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 @@
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()
{
Modified: trunk/BOOK/lsb-bootscripts/etc/default/rc.site
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/default/rc.site 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/default/rc.site 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -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 @@
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
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/checkfs
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/checkfs 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/checkfs 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/checkfs
+# Begin $RC_BASE/init.d/checkfs
### BEGIN INIT INFO
# Provides: checkfs
@@ -100,4 +100,4 @@
;;
esac
-# End /etc/init.d/checkfs
+# End $RC_BASE/init.d/checkfs
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/cleanfs
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/cleanfs 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/cleanfs 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/cleanfs
+# Begin $RC_BASE/init.d/cleanfs
### BEGIN INIT INFO
# Provides: cleanfs
@@ -102,5 +102,4 @@
;;
esac
-# End /etc/init.d/cleanfs
-
+# End $RC_BASE/init.d/cleanfs
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/console
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/console 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/console 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin $rc_base/init.d/console
+# Begin $RC_BASE/init.d/console
### BEGIN INIT INFO
# Provides: console
@@ -93,4 +93,4 @@
;;
esac
-# End $rc_base/init.d/console
+# End $RC_BASE/init.d/console
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/halt
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/halt 2011-05-23 03:43:35 UTC (rev
9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/halt 2011-05-23 05:07:21 UTC (rev
9552)
@@ -27,4 +27,4 @@
;;
esac
-# End /etc/init.d/halt
+# End $RC_BASE/init.d/halt
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/localnet
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/localnet 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/localnet 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/localnet
+# Begin $RC_BASE/init.d/localnet
### BEGIN INIT INFO
# Provides: localnet
@@ -78,4 +78,4 @@
;;
esac
-# End /etc/init.d/localnet
+# End $RC_BASE/init.d/localnet
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/modules
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/modules 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/modules 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/modules
+# Begin $RC_BASE/init.d/modules
### BEGIN INIT INFO
# Provides: modules
@@ -94,4 +94,4 @@
;;
esac
-# End /etc/init.d/modules
+# End $RC_BASE/init.d/modules
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/mountfs
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/mountfs 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/mountfs 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/mountfs
+# Begin $RC_BASE/init.d/mountfs
### BEGIN INIT INFO
# Provides: $local_fs
@@ -56,4 +56,4 @@
;;
esac
-# End /etc/init.d/mountfs
+# End $RC_BASE/init.d/mountfs
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/mountvirtfs
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/mountvirtfs 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/mountvirtfs 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/mountvirtfs
+# Begin $RC_BASE/init.d/mountvirtfs
### BEGIN INIT INFO
# Provides: mountvirtfs
@@ -43,4 +43,4 @@
;;
esac
-# End /etc/init.d/mountvirtfs
+# End $RC_BASE/init.d/mountvirtfs
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/network
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/network 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/network 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/network
+# Begin $RC_BASE/init.d/network
### BEGIN INIT INFO
# Provides: $network
@@ -81,4 +81,4 @@
;;
esac
-# End /etc/init.d/network
+# End $RC_BASE/init.d/network
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/reboot
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/reboot 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/reboot 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/reboot
+# Begin $RC_BASE/init.d/reboot
### BEGIN INIT INFO
# Provides: reboot
@@ -29,4 +29,4 @@
esac
-# End /etc/init.d/reboot
+# End $RC_BASE/init.d/reboot
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/sendsignals
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/sendsignals 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/sendsignals 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/sendsignals
+# Begin $RC_BASE/init.d/sendsignals
### BEGIN INIT INFO
# Provides: sendsignals
@@ -51,4 +51,4 @@
esac
-# End /etc/init.d/sendsignals
+# End $RC_BASE/init.d/sendsignals
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/setclock
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/setclock 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/setclock 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/setclock
+# Begin $RC_BASE/init.d/setclock
### BEGIN INIT INFO
# Provides: hwclock
@@ -51,4 +51,4 @@
esac
-# End /etc/init.d/setclock
+# End $RC_BASE/init.d/setclock
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/swap
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/swap 2011-05-23 03:43:35 UTC (rev
9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/swap 2011-05-23 05:07:21 UTC (rev
9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/swap
+# Begin $RC_BASE/init.d/swap
### BEGIN INIT INFO
# Provides: swap
@@ -52,4 +52,4 @@
;;
esac
-# End /etc/init.d/swap
+# End $RC_BASE/init.d/swap
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/sysctl
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/sysctl 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/sysctl 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/sysctl
+# Begin $RC_BASE/init.d/sysctl
### BEGIN INIT INFO
# Provides: sysctl
@@ -36,4 +36,4 @@
;;
esac
-# End /etc/init.d/sysctl
+# End $RC_BASE/init.d/sysctl
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/sysklogd
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/sysklogd 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/sysklogd 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/sysklogd
+# Begin $RC_BASE/init.d/sysklogd
### BEGIN INIT INFO
# Provides: $syslog
@@ -66,4 +66,4 @@
;;
esac
-# End /etc/init.d/sysklogd
+# End $RC_BASE/init.d/sysklogd
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/template
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/template 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/template 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin /etc/init.d/template
+# Begin $RC_BASE/init.d/template
### BEGIN INIT INFO
# Provides: template
@@ -87,4 +87,4 @@
;;
esac
-# End /etc/init.d/template
+# End $RC_BASE/init.d/template
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/udev
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/udev 2011-05-23 03:43:35 UTC (rev
9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/udev 2011-05-23 05:07:21 UTC (rev
9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin $rc_base/init.d/udev
+# Begin $RC_BASE/init.d/udev
### BEGIN INIT INFO
# Provides: udev
@@ -87,4 +87,4 @@
;;
esac
-# End $rc_base/init.d/udev
+# End $RC_BASE/init.d/udev
Modified: trunk/BOOK/lsb-bootscripts/etc/init.d/udev_retry
===================================================================
--- trunk/BOOK/lsb-bootscripts/etc/init.d/udev_retry 2011-05-23 03:43:35 UTC
(rev 9551)
+++ trunk/BOOK/lsb-bootscripts/etc/init.d/udev_retry 2011-05-23 05:07:21 UTC
(rev 9552)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Begin $rc_base/init.d/udev_retry
+# Begin $RC_BASE/init.d/udev_retry
### BEGIN INIT INFO
# Provides: udev_retry
@@ -46,4 +46,4 @@
;;
esac
-# End $rc_base/init.d/udev_retry
+# End $RC_BASE/init.d/udev_retry
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
