Author: dj
Date: 2011-05-14 12:54:11 -0600 (Sat, 14 May 2011)
New Revision: 9527
Modified:
trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/checkfs
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/localnet
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/setclock
trunk/BOOK/bootscripts/contrib/lsb-v3/sysconfig/rc.site
Log:
Moved configuration of clock and hostname to rc.site
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog 2011-05-14 18:46:00 UTC
(rev 9526)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog 2011-05-14 18:54:11 UTC
(rev 9527)
@@ -1,8 +1,9 @@
ChangeLog
20110514 - [dj]
- * Added FAILURE_ACTION variable to rc.site for use in remote systems
+ * Added FAILURE_ACTION variable to rc.site for use in remote systems
where user input is not appropriate in the event of a failure
+ * Moved configuration of clock and hostname to rc.site
20110424 - [dj]
* Sync to LFS-Bootscripts-20110424 (move new run mounts and
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/checkfs
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/checkfs 2011-05-14
18:46:00 UTC (rev 9526)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/checkfs 2011-05-14
18:54:11 UTC (rev 9527)
@@ -3,7 +3,7 @@
### BEGIN INIT INFO
# Provides: checkfs
-# Required-Start: udev swap $time
+# Required-Start: udev swap
# Should-Start:
# Required-Stop:
# Should-Stop:
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/localnet
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/localnet 2011-05-14
18:46:00 UTC (rev 9526)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/localnet 2011-05-14
18:54:11 UTC (rev 9527)
@@ -16,7 +16,6 @@
### END INIT INFO
. /lib/lsb/init-functions
-. /etc/sysconfig/network
case "${1}" in
start)
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/setclock
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/setclock 2011-05-14
18:46:00 UTC (rev 9526)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/setclock 2011-05-14
18:54:11 UTC (rev 9527)
@@ -2,12 +2,12 @@
# Begin /etc/init.d/setclock
### BEGIN INIT INFO
-# Provides: $time
+# Provides: hwclock
# Required-Start:
# Should-Start: modules
# Required-Stop:
# Should-Stop: $syslog
-# Default-Start: S
+# Default-Start:
# Default-Stop:
# Short-Description: Stores and restores time from the hardware clock
# Description: On boot, system time is obtained from hwclock. The
@@ -18,14 +18,9 @@
. /lib/lsb/init-functions
BIN_FILE="/sbin/hwclock"
-CONFIGFILE="/etc/sysconfig/clock"
chk_stat
-. "${CONFIGFILE}"
-
-CLOCKPARAMS=
-
case "${UTC}" in
yes|true|1)
CLOCKPARAMS="${CLOCKPARAMS} --utc"
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/sysconfig/rc.site
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/sysconfig/rc.site 2011-05-14
18:46:00 UTC (rev 9526)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/sysconfig/rc.site 2011-05-14
18:54:11 UTC (rev 9527)
@@ -13,6 +13,13 @@
# Bootlogging (requires a tempfs mount)
BOOTLOG_ENAB="yes"
+# Hostname
+HOSTNAME=<lfs>
+
+# System time variables
+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"
@@ -37,7 +44,7 @@
# 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 HOSTNAME UTC CLOCKPARAMS FAILURE_ACTION
export DISTRO DISTRO_CONTACT DISTRO_MINI
export BRACKET FAILURE INFO NORMAL SUCCESS WARNING
export PREFIX_SUCCESS PREFIX_WARNING PREFIX_FAILURE
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
