Moved configuration of clock and hostname to rc.site

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

5 files changed, 13 insertions, 11 deletions

diff --git a/bootscripts/contrib/lsb-v3/ChangeLog b/bootscripts/contrib/lsb-v3/ChangeLog
index 94e7f0e86..6212903d8 100644
--- a/bootscripts/contrib/lsb-v3/ChangeLog
+++ b/bootscripts/contrib/lsb-v3/ChangeLog
@@ -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
diff --git a/bootscripts/contrib/lsb-v3/init.d/checkfs b/bootscripts/contrib/lsb-v3/init.d/checkfs
index 599e2cbc6..1e3efed9b 100644
--- a/bootscripts/contrib/lsb-v3/init.d/checkfs
+++ b/bootscripts/contrib/lsb-v3/init.d/checkfs
@@ -3,7 +3,7 @@
 
 ### BEGIN INIT INFO
 # Provides:            checkfs
-# Required-Start:      udev swap $time
+# Required-Start:      udev swap
 # Should-Start:
 # Required-Stop:
 # Should-Stop:
diff --git a/bootscripts/contrib/lsb-v3/init.d/localnet b/bootscripts/contrib/lsb-v3/init.d/localnet
index c63c4baa6..322bb8749 100644
--- a/bootscripts/contrib/lsb-v3/init.d/localnet
+++ b/bootscripts/contrib/lsb-v3/init.d/localnet
@@ -16,7 +16,6 @@
 ### END INIT INFO
 
 . /lib/lsb/init-functions
-. /etc/sysconfig/network
 
 case "${1}" in
     start)
diff --git a/bootscripts/contrib/lsb-v3/init.d/setclock b/bootscripts/contrib/lsb-v3/init.d/setclock
index 2acceaa92..5d47b8dc8 100644
--- a/bootscripts/contrib/lsb-v3/init.d/setclock
+++ b/bootscripts/contrib/lsb-v3/init.d/setclock
@@ -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"
diff --git a/bootscripts/contrib/lsb-v3/sysconfig/rc.site b/bootscripts/contrib/lsb-v3/sysconfig/rc.site
index 63ef59096..f3369db58 100644
--- a/bootscripts/contrib/lsb-v3/sysconfig/rc.site
+++ b/bootscripts/contrib/lsb-v3/sysconfig/rc.site
@@ -13,6 +13,13 @@ TEMPFS_MOUNT="${RC_BASE}/init.d/boottemp"
 # 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 @@ 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 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