gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-05 22:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to lfs-bootscripts-20110531.

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9556 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
DJ Lucas 2011-05-31 03:36:33 +00:00
parent dde63db80c
commit 43c2ecf0b8
8 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
appendices/scripts.xml
View File

@ -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>

6
bootscripts/ChangeLog
View File

@ -1,4 +1,8 @@
2011-04-19 Bruce Dubbs <bdubbs@linuxfromscratch.org>
2011-05-31 DJ Lucas <dj@linuxfromscratch.org>
* lfs/init.d/udev: Add multiple udev triggers for both subsystems and
devices per upstream recommendation.
2011-04-19 Bruce Dubbs <bdubbs@linuxfromscratch.org>
* lfs/init.d/mountvirtfs: Add creation of /run/{var,lock,shm}.
* lfs/init.d/udev: Add /dev/shm -> /run/shm symlink.

3
bootscripts/lfs/init.d/udev
View File

@ -65,7 +65,8 @@ case "${1}" in
# 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

9
chapter01/changelog.xml
View File

@ -36,6 +36,15 @@
</listitem>
-->
<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>

4
general.ent
View File

@ -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 &ndash; -->
<!ENTITY milestone "6.9">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

4
make-aux-files.sh
View File

@ -4,11 +4,11 @@ rm -f lfs-bootscripts*.tar.bz2
# 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

2
packages.ent
View File

@ -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 -->

16
process-scripts.sh
View File

@ -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/\&/\&amp\;/g' -e 's/</\&lt\;/g' -e 's/>/\&gt\;/g' \
-e "s/'/\&apos\;/g" -e 's/"/\&quot\;/g' -e 's/\t/ /g' \