gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 11:49:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix up issues with bootscript generation.

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9546 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Matthew Burgess 2011-05-22 22:20:22 +00:00
parent ff8773db8e
commit b8d2a723d7
3 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
appendices/scripts.xml
View File

@ -5,16 +5,14 @@
<!ENTITY checkfs SYSTEM "checkfs.script"> <!ENTITY checkfs SYSTEM "checkfs.script">
<!ENTITY cleanfs SYSTEM "cleanfs.script"> <!ENTITY cleanfs SYSTEM "cleanfs.script">
<!ENTITY console SYSTEM "console.script"> <!ENTITY console SYSTEM "console.script">
<!ENTITY functions SYSTEM "functions.script">
<!ENTITY consolelog SYSTEM "consolelog.script">
<!ENTITY halt SYSTEM "halt.script"> <!ENTITY halt SYSTEM "halt.script">
<!ENTITY localnet SYSTEM "localnet.script"> <!ENTITY localnet SYSTEM "localnet.script">
<!ENTITY modules SYSTEM "modules.script"> <!ENTITY modules SYSTEM "modules.script">
<!ENTITY mountfs SYSTEM "mountfs.script"> <!ENTITY mountfs SYSTEM "mountfs.script">
<!ENTITY mountvirtfs SYSTEM "mountvirtfs.script"> <!ENTITY mountvirtfs SYSTEM "mountvirtfs.script">
<!ENTITY network SYSTEM "network.script"> <!ENTITY network SYSTEM "network.script">
<!ENTITY reboot SYSTEM "reboot.script">
<!ENTITY rc SYSTEM "rc.script"> <!ENTITY rc SYSTEM "rc.script">
<!ENTITY reboot SYSTEM "reboot.script">
<!ENTITY sendsignals SYSTEM "sendsignals.script"> <!ENTITY sendsignals SYSTEM "sendsignals.script">
<!ENTITY setclock SYSTEM "setclock.script"> <!ENTITY setclock SYSTEM "setclock.script">
<!ENTITY swap SYSTEM "swap.script"> <!ENTITY swap SYSTEM "swap.script">
@ -26,6 +24,7 @@
<!ENTITY createfiles SYSTEM "createfiles.script"> <!ENTITY createfiles SYSTEM "createfiles.script">
<!ENTITY modules_sys SYSTEM "modules-sysinit.script"> <!ENTITY modules_sys SYSTEM "modules-sysinit.script">
<!ENTITY rc_sys SYSTEM "rc-sysinit.script"> <!ENTITY rc_sys SYSTEM "rc-sysinit.script">
<!ENTITY rc_site SYSTEM "rc-site.script">
<!ENTITY ifup SYSTEM "ifup.script"> <!ENTITY ifup SYSTEM "ifup.script">
<!ENTITY ifdown SYSTEM "ifdown.script"> <!ENTITY ifdown SYSTEM "ifdown.script">
<!ENTITY ipv4_static SYSTEM "ipv4-static.script"> <!ENTITY ipv4_static SYSTEM "ipv4-static.script">
@ -57,21 +56,11 @@
<screen>&rc;</screen> <screen>&rc;</screen>
</sect1> </sect1>
<sect1 id="functions" role="wrap">
<title>/etc/rc.d/init.d/functions</title>
<screen>&functions;</screen>
</sect1>
<sect1 id="mountvirtfs" role="wrap"> <sect1 id="mountvirtfs" role="wrap">
<title>/etc/rc.d/init.d/mountvirtfs</title> <title>/etc/rc.d/init.d/mountvirtfs</title>
<screen>&mountvirtfs;</screen> <screen>&mountvirtfs;</screen>
</sect1> </sect1>
<sect1 id="consolelog" role="wrap">
<title>/etc/rc.d/init.d/consolelog</title>
<screen>&consolelog;</screen>
</sect1>
<sect1 id="modules" role="wrap"> <sect1 id="modules" role="wrap">
<title>/etc/rc.d/init.d/modules</title> <title>/etc/rc.d/init.d/modules</title>
<screen>&modules;</screen> <screen>&modules;</screen>

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 # Get base file name and move bootscripts directory to that name
version=`grep "ENTITY lfs-bootscripts-version" packages.ent |cut -d'"' -f2` version=`grep "ENTITY lfs-bootscripts-version" packages.ent |cut -d'"' -f2`
mv bootscripts lfs-bootscripts-$version mv lsb-bootscripts lfs-bootscripts-$version
# Create the tarball and clean up # Create the tarball and clean up
tar -cjf lfs-bootscripts-$version.tar.bz2 --exclude .svn lfs-bootscripts-$version tar -cjf lfs-bootscripts-$version.tar.bz2 --exclude .svn lfs-bootscripts-$version
mv lfs-bootscripts-$version bootscripts mv lfs-bootscripts-$version lsb-bootscripts
rm -f udev-config*.bz2 rm -f udev-config*.bz2

16
process-scripts.sh
View File

@ -1,20 +1,20 @@
#!/bin/bash #!/bin/bash
# Boot scripts # Boot scripts
for s in bootscripts/lfs/init.d/* \ for s in lsb-bootscripts/etc/init.d/* \
bootscripts/lfs/sysconfig/* \ lsb-bootscripts/etc/default/* \
bootscripts/lfs/sysconfig/network-devices/* \ lsb-bootscripts/sbin/* \
bootscripts/lfs/sysconfig/network-devices/services/* lsb-bootscripts/lib/network-services/*
do do
script=$(basename $s) script=$(basename $s)
# Skip directories # Skip directories
[ $script == 'network-devices' ] && continue [ $script == 'sbin' ] && continue
[ $script == 'services' ] && continue [ $script == 'network-services' ] && continue
# Disambiguate duplicate file names # Disambiguate duplicate file names
[ $s == 'bootscripts/lfs/sysconfig/rc' ] && script='rc-sysinit'; [ $s == 'lsb-bootscripts/etc/default/rc' ] && script='rc-sysinit';
[ $s == 'bootscripts/lfs/sysconfig/modules' ] && script='modules-sysinit'; [ $s == 'lsb-bootscripts/etc/default/modules' ] && script='modules-sysinit';
sed -e 's/\&/\&amp\;/g' -e 's/</\&lt\;/g' -e 's/>/\&gt\;/g' \ 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' \ -e "s/'/\&apos\;/g" -e 's/"/\&quot\;/g' -e 's/\t/ /g' \