Fix up issues with bootscript generation.

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

3 files changed, 12 insertions, 23 deletions

diff --git a/appendices/scripts.xml b/appendices/scripts.xml
index cc89fdc90..7bac2588e 100644
--- a/appendices/scripts.xml
+++ b/appendices/scripts.xml
@@ -5,16 +5,14 @@
   <!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"> 
   <!ENTITY mountfs            SYSTEM "mountfs.script"> 
   <!ENTITY mountvirtfs        SYSTEM "mountvirtfs.script"> 
   <!ENTITY network            SYSTEM "network.script"> 
-  <!ENTITY reboot             SYSTEM "reboot.script"> 
   <!ENTITY rc                 SYSTEM "rc.script"> 
+  <!ENTITY reboot             SYSTEM "reboot.script"> 
   <!ENTITY sendsignals        SYSTEM "sendsignals.script"> 
   <!ENTITY setclock           SYSTEM "setclock.script"> 
   <!ENTITY swap               SYSTEM "swap.script"> 
@@ -26,6 +24,7 @@
   <!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"> 
@@ -57,21 +56,11 @@
     <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> 
diff --git a/make-aux-files.sh b/make-aux-files.sh
index c57352a9d..10cdf327c 100755
--- a/make-aux-files.sh
+++ b/make-aux-files.sh
@@ -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 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
 
diff --git a/process-scripts.sh b/process-scripts.sh
index 44518c423..184d5d564 100644
--- a/process-scripts.sh
+++ b/process-scripts.sh
@@ -1,20 +1,20 @@
 #!/bin/bash
 
 # 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' \
        -e "s/'/\&apos\;/g" -e 's/"/\&quot\;/g' -e 's/\t/    /g'  \