Browse Source

Change the bootsripts and udev configuration so the rtc is set by udev upon boot.
Removed aio device from udev configuration so defaults are used.


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

Bruce Dubbs 16 years ago
parent
commit
63f6e21758

+ 0 - 2
bootscripts/Makefile

@@ -72,7 +72,6 @@ install: create-dirs create-service-dir
 	ln -sf ../init.d/modules     ${EXTDIR}/rc.d/rcsysinit.d/S05modules
 	ln -sf ../init.d/modules     ${EXTDIR}/rc.d/rcsysinit.d/S05modules
 	ln -sf ../init.d/udev        ${EXTDIR}/rc.d/rcsysinit.d/S10udev
 	ln -sf ../init.d/udev        ${EXTDIR}/rc.d/rcsysinit.d/S10udev
 	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rcsysinit.d/S20swap
 	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rcsysinit.d/S20swap
-	ln -sf ../init.d/setclock    ${EXTDIR}/rc.d/rcsysinit.d/S25setclock
 	ln -sf ../init.d/checkfs     ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
 	ln -sf ../init.d/checkfs     ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
 	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
 	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
 	ln -sf ../init.d/cleanfs     ${EXTDIR}/rc.d/rcsysinit.d/S45cleanfs
 	ln -sf ../init.d/cleanfs     ${EXTDIR}/rc.d/rcsysinit.d/S45cleanfs
@@ -123,7 +122,6 @@ minimal: create-dirs create-service-dir
 	ln -sf ../init.d/mountkernfs ${EXTDIR}/rc.d/rcsysinit.d/S00mountkernfs
 	ln -sf ../init.d/mountkernfs ${EXTDIR}/rc.d/rcsysinit.d/S00mountkernfs
 	ln -sf ../init.d/udev        ${EXTDIR}/rc.d/rcsysinit.d/S10udev
 	ln -sf ../init.d/udev        ${EXTDIR}/rc.d/rcsysinit.d/S10udev
 	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rcsysinit.d/S20swap
 	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rcsysinit.d/S20swap
-	ln -sf ../init.d/setclock    ${EXTDIR}/rc.d/rcsysinit.d/S25setclock
 	ln -sf ../init.d/checkfs     ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
 	ln -sf ../init.d/checkfs     ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
 	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
 	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
 	ln -sf ../init.d/cleanfs     ${EXTDIR}/rc.d/rcsysinit.d/S45cleanfs
 	ln -sf ../init.d/cleanfs     ${EXTDIR}/rc.d/rcsysinit.d/S45cleanfs

+ 0 - 2
bootscripts/lfs/init.d/setclock

@@ -16,8 +16,6 @@
 . ${rc_functions}
 . ${rc_functions}
 . /etc/sysconfig/clock
 . /etc/sysconfig/clock
 
 
-CLOCKPARAMS=
-
 case "${UTC}" in
 case "${UTC}" in
 	yes|true|1)
 	yes|true|1)
 		CLOCKPARAMS="${CLOCKPARAMS} --utc"
 		CLOCKPARAMS="${CLOCKPARAMS} --utc"

+ 7 - 0
chapter01/changelog.xml

@@ -40,6 +40,13 @@
     <listitem>
     <listitem>
       <para>2009-05-23</para>
       <para>2009-05-23</para>
       <itemizedlist>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Change the bootsripts and udev configuration
+          so the rtc is set by udev upon boot. Removed aio device
+          from udev configuration.  Fixes
+          <ulink url="&lfs-ticket-root;2266">#2266</ulink> and
+          <ulink url="&lfs-ticket-root;2297">#2297</ulink>.</para>
+        </listitem>
         <listitem>
         <listitem>
           <para>[bdubbs] - Expand package management discussion and
           <para>[bdubbs] - Expand package management discussion and
           add a section on deploying an LFS system to another host. Fixes
           add a section on deploying an LFS system to another host. Fixes

+ 9 - 0
chapter07/setclock.xml

@@ -23,6 +23,11 @@
   way to detect whether or not the hardware clock is set to UTC, so this
   way to detect whether or not the hardware clock is set to UTC, so this
   needs to be configured manually.</para>
   needs to be configured manually.</para>
 
 
+  <para>The <command>setclock</command> is run via
+  <application>udev</application> when the kernel detects the hardware
+  capability upon boot.  It can also be run manually with the stop parameter to
+  store the system time to the CMOS clock.</para>
+
   <para>If you cannot remember whether or not the hardware clock is set to UTC,
   <para>If you cannot remember whether or not the hardware clock is set to UTC,
   find out by running the <userinput>hwclock --localtime --show</userinput>
   find out by running the <userinput>hwclock --localtime --show</userinput>
   command. This will display what the current time is according to the hardware
   command. This will display what the current time is according to the hardware
@@ -46,6 +51,10 @@
 
 
 UTC=1
 UTC=1
 
 
+# Set this to any options you might need to give to hwclock, 
+# such as machine hardware clock type for Alphas.
+CLOCKPARAMS=
+
 # End /etc/sysconfig/clock</literal>
 # End /etc/sysconfig/clock</literal>
 EOF</userinput></screen>
 EOF</userinput></screen>
 
 

+ 2 - 2
packages.ent

@@ -298,7 +298,7 @@
 <!ENTITY less-ch6-du "2.8 MB">
 <!ENTITY less-ch6-du "2.8 MB">
 <!ENTITY less-ch6-sbu "0.1 SBU">
 <!ENTITY less-ch6-sbu "0.1 SBU">
 
 
-<!ENTITY lfs-bootscripts-version "20090517">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20090523">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
@@ -511,7 +511,7 @@
 <!ENTITY udev-ch6-du "10.7 MB">
 <!ENTITY udev-ch6-du "10.7 MB">
 <!ENTITY udev-ch6-sbu "0.2 SBU">
 <!ENTITY udev-ch6-sbu "0.2 SBU">
 
 
-<!ENTITY udev-config "udev-config-20081229"> <!-- Scripts depend on this format -->
+<!ENTITY udev-config "udev-config-20090523"> <!-- Scripts depend on this format -->
 <!ENTITY udev-config-size "UDEV-SIZE KB">    <!-- Updated in Makefile -->
 <!ENTITY udev-config-size "UDEV-SIZE KB">    <!-- Updated in Makefile -->
 <!ENTITY udev-config-url "&downloads-root;&udev-config;.tar.bz2">
 <!ENTITY udev-config-url "&downloads-root;&udev-config;.tar.bz2">
 <!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile -->
 <!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile -->

+ 2 - 2
udev-config/55-lfs.rules

@@ -2,8 +2,8 @@
 
 
 # Core kernel devices
 # Core kernel devices
 
 
-KERNEL=="aio",      MODE="0444"
-KERNEL=="rtc",      MODE="0666"
+# This causes the system clock to be set as soon as /dev/rtc becomes available.
+SUBSYSTEM=="rtc", MODE="0644", ACTION=="add", RUN+="/etc/rc.d/init.d/setclock start"
 
 
 # Comms devices
 # Comms devices