Author: dj
Date: 2011-05-30 21:36:33 -0600 (Mon, 30 May 2011)
New Revision: 9556
Modified:
trunk/BOOK/appendices/scripts.xml
trunk/BOOK/bootscripts/ChangeLog
trunk/BOOK/bootscripts/lfs/init.d/udev
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/general.ent
trunk/BOOK/make-aux-files.sh
trunk/BOOK/packages.ent
trunk/BOOK/process-scripts.sh
Log:
Update to lfs-bootscripts-20110531.
Modified: trunk/BOOK/appendices/scripts.xml
===================================================================
--- trunk/BOOK/appendices/scripts.xml 2011-05-23 19:58:42 UTC (rev 9555)
+++ trunk/BOOK/appendices/scripts.xml 2011-05-31 03:36:33 UTC (rev 9556)
@@ -5,6 +5,8 @@
<!ENTITY checkfs SYSTEM "checkfs.script">
<!ENTITY cleanfs SYSTEM "cleanfs.script">
<!ENTITY console SYSTEM "console.script">
+ <!ENTITY functions SYSTEM "functions.script">
+ <!ENTITY consolelog SYSTEM "consolelog.script">
<!ENTITY halt SYSTEM "halt.script">
<!ENTITY localnet SYSTEM "localnet.script">
<!ENTITY modules SYSTEM "modules.script">
@@ -24,7 +26,6 @@
<!ENTITY createfiles SYSTEM "createfiles.script">
<!ENTITY modules_sys SYSTEM "modules-sysinit.script">
<!ENTITY rc_sys SYSTEM "rc-sysinit.script">
- <!ENTITY rc_site SYSTEM "rc-site.script">
<!ENTITY ifup SYSTEM "ifup.script">
<!ENTITY ifdown SYSTEM "ifdown.script">
<!ENTITY ipv4_static SYSTEM "ipv4-static.script">
@@ -56,11 +57,21 @@
<screen>&rc;</screen>
</sect1>
+ <sect1 id="functions" role="wrap">
+ <title>/etc/rc.d/init.d/functions</title>
+ <screen>&functions;</screen>
+ </sect1>
+
<sect1 id="mountvirtfs" role="wrap">
<title>/etc/rc.d/init.d/mountvirtfs</title>
<screen>&mountvirtfs;</screen>
</sect1>
+ <sect1 id="consolelog" role="wrap">
+ <title>/etc/rc.d/init.d/consolelog</title>
+ <screen>&consolelog;</screen>
+ </sect1>
+
<sect1 id="modules" role="wrap">
<title>/etc/rc.d/init.d/modules</title>
<screen>&modules;</screen>
Modified: trunk/BOOK/bootscripts/ChangeLog
===================================================================
--- trunk/BOOK/bootscripts/ChangeLog 2011-05-23 19:58:42 UTC (rev 9555)
+++ trunk/BOOK/bootscripts/ChangeLog 2011-05-31 03:36:33 UTC (rev 9556)
@@ -1,4 +1,8 @@
-2011-04-19 Bruce Dubbs <[email protected]>
+2011-05-31 DJ Lucas <[email protected]>
+ * lfs/init.d/udev: Add multiple udev triggers for both subsystems and
+ devices per upstream recommendation.
+
+2011-04-19 Bruce Dubbs <[email protected]>
* lfs/init.d/mountvirtfs: Add creation of /run/{var,lock,shm}.
* lfs/init.d/udev: Add /dev/shm -> /run/shm symlink.
Modified: trunk/BOOK/bootscripts/lfs/init.d/udev
===================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/udev 2011-05-23 19:58:42 UTC (rev
9555)
+++ trunk/BOOK/bootscripts/lfs/init.d/udev 2011-05-31 03:36:33 UTC (rev
9556)
@@ -65,7 +65,8 @@
# Now traverse /sys in order to "coldplug" devices that have
# already been discovered
- /sbin/udevadm trigger --action=add
+ /sbin/udevadm trigger --action=add --type=subsystems
+ /sbin/udevadm trigger --action=add --type=devices
# Now wait for udevd to process the uevents we triggered
/sbin/udevadm settle
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2011-05-23 19:58:42 UTC (rev 9555)
+++ trunk/BOOK/chapter01/changelog.xml 2011-05-31 03:36:33 UTC (rev 9556)
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>2011-05-31</para>
+ <itemizedlist>
+ <listitem>
+ <para>[dj] - Updated to lfs-bootscripts-20110531.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2011-05-23</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2011-05-23 19:58:42 UTC (rev 9555)
+++ trunk/BOOK/general.ent 2011-05-31 03:36:33 UTC (rev 9556)
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20110523">
-<!ENTITY releasedate "May 23, 2011">
+<!ENTITY version "SVN-20110531">
+<!ENTITY releasedate "May 31, 2011">
<!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not
– -->
<!ENTITY milestone "6.9">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
Modified: trunk/BOOK/make-aux-files.sh
===================================================================
--- trunk/BOOK/make-aux-files.sh 2011-05-23 19:58:42 UTC (rev 9555)
+++ trunk/BOOK/make-aux-files.sh 2011-05-31 03:36:33 UTC (rev 9556)
@@ -4,11 +4,11 @@
# Get base file name and move bootscripts directory to that name
version=`grep "ENTITY lfs-bootscripts-version" packages.ent |cut -d'"' -f2`
-mv lsb-bootscripts lfs-bootscripts-$version
+mv bootscripts lfs-bootscripts-$version
# Create the tarball and clean up
tar -cjf lfs-bootscripts-$version.tar.bz2 --exclude .svn
lfs-bootscripts-$version
-mv lfs-bootscripts-$version lsb-bootscripts
+mv lfs-bootscripts-$version bootscripts
rm -f udev-config*.bz2
Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent 2011-05-23 19:58:42 UTC (rev 9555)
+++ trunk/BOOK/packages.ent 2011-05-31 03:36:33 UTC (rev 9556)
@@ -297,7 +297,7 @@
<!ENTITY less-ch6-du "2.9 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
-<!ENTITY lfs-bootscripts-version "20110424"> <!-- Scripts
depend on this format -->
+<!ENTITY lfs-bootscripts-version "20110531"> <!-- Scripts
depend on this format -->
<!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-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in
Makefile -->
Modified: trunk/BOOK/process-scripts.sh
===================================================================
--- trunk/BOOK/process-scripts.sh 2011-05-23 19:58:42 UTC (rev 9555)
+++ trunk/BOOK/process-scripts.sh 2011-05-31 03:36:33 UTC (rev 9556)
@@ -1,20 +1,20 @@
#!/bin/bash
# Boot scripts
-for s in lsb-bootscripts/etc/init.d/* \
- lsb-bootscripts/etc/default/* \
- lsb-bootscripts/sbin/* \
- lsb-bootscripts/lib/network-services/*
+for s in bootscripts/lfs/init.d/* \
+ bootscripts/lfs/sysconfig/* \
+ bootscripts/lfs/sysconfig/network-devices/* \
+ bootscripts/lfs/sysconfig/network-devices/services/*
do
script=$(basename $s)
# Skip directories
- [ $script == 'sbin' ] && continue
- [ $script == 'network-services' ] && continue
+ [ $script == 'network-devices' ] && continue
+ [ $script == 'services' ] && continue
# Disambiguate duplicate file names
- [ $s == 'lsb-bootscripts/etc/default/rc' ] && script='rc-sysinit';
- [ $s == 'lsb-bootscripts/etc/default/modules' ] && script='modules-sysinit';
+ [ $s == 'bootscripts/lfs/sysconfig/rc' ] && script='rc-sysinit';
+ [ $s == 'bootscripts/lfs/sysconfig/modules' ] && script='modules-sysinit';
sed -e 's/\&/\&\;/g' -e 's/</\<\;/g' -e 's/>/\>\;/g' \
-e "s/'/\&apos\;/g" -e 's/"/\"\;/g' -e 's/\t/ /g' \
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
