Changeset b8d2a72

Timestamp:

05/22/2011 10:20:22 PM (13 years ago)

Author:

Matthew Burgess <matthew@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

47045599

Parents:

ff8773d

Message:

Fix up issues with bootscript generation.

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

Files:

• appendices/scripts.xml (modified) (4 diffs)
• make-aux-files.sh (modified) (1 diff)
• process-scripts.sh (modified) (1 diff)

appendices/scripts.xml

@@ -6 +6 @@
   <!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"> 
@@ -14 +12 @@
   <!ENTITY mountvirtfs        SYSTEM "mountvirtfs.script"> 
   <!ENTITY network            SYSTEM "network.script"> 
+  <!ENTITY rc                 SYSTEM "rc.script"> 
   <!ENTITY reboot             SYSTEM "reboot.script"> 
-  <!ENTITY rc                 SYSTEM "rc.script"> 
   <!ENTITY sendsignals        SYSTEM "sendsignals.script"> 
   <!ENTITY setclock           SYSTEM "setclock.script"> 
@@ -27 +25 @@
   <!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"> 
@@ -58 +57 @@
   </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>
 

make-aux-files.sh

@@ -5 +5 @@
 # Get base file name and move bootscripts directory to that name
 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
 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

process-scripts.sh

@@ -2 +2 @@
 
 # Boot scripts
-for s in bootscripts/lfs/init.d/*                    \
-         bootscripts/lfs/sysconfig/*                 \
-         bootscripts/lfs/sysconfig/network-devices/* \
-         bootscripts/lfs/sysconfig/network-devices/services/*
+for s in lsb-bootscripts/etc/init.d/*                    \
+         lsb-bootscripts/etc/default/*                 \
+         lsb-bootscripts/sbin/* \
+         lsb-bootscripts/lib/network-services/*
 do
   script=$(basename $s)
   
   # Skip directories
-  [ $script == 'network-devices' ] && continue
-  [ $script == 'services'        ] && continue
+  [ $script == 'sbin' ] && continue
+  [ $script == 'network-services'        ] && continue
 
   # Disambiguate duplicate file names
-  [ $s == 'bootscripts/lfs/sysconfig/rc'      ] && script='rc-sysinit'; 
-  [ $s == 'bootscripts/lfs/sysconfig/modules' ] && script='modules-sysinit'; 
+  [ $s == 'lsb-bootscripts/etc/default/rc'      ] && script='rc-sysinit'; 
+  [ $s == 'lsb-bootscripts/etc/default/modules' ] && script='modules-sysinit'; 
   
   sed  -e 's/\&/\&amp\;/g' -e 's/</\&lt\;/g'   -e 's/>/\&gt\;/g' \