X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Finstall-bootscripts;h=15f22e825a3c501795536f1abc9e0b0972a35653;hb=2ae8d010cef72cd9f12c7ca3cf9260ffe68fa4ca;hp=5c0def225f991f17132d96f74b92fa9a967213aa;hpb=3605ab38ca7604b1fe43c3bce5e4963730a85d39;p=hvlinux.git

diff --git a/stage1/install-bootscripts b/stage1/install-bootscripts
index 5c0def2..15f22e8 100755
--- a/stage1/install-bootscripts
+++ b/stage1/install-bootscripts
@@ -1,10 +1,6 @@
 #!/bin/bash
-set -o errexit
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
+source ../functions/main
 
 # Clock settings
 cat > ${LFS}/etc/sysconfig/clock << "EOF"
@@ -13,10 +9,10 @@ EOF
 
 # Copying boot scripts
 STAGE1_BOOTSCRIPTS="checkfs cleanfs functions halt hostname initlog modules mountfs \
-    mountkernfs rc reboot sendsignals setclock swap udev"
+    mountkernfs rc reboot sendsignals swap udev"
 mkdir -p ${LFS}/etc/rc.d/init.d
 for bootscript in ${STAGE1_BOOTSCRIPTS}; do
-    install -m755 bootscripts/${bootscript} ${LFS}/etc/rc.d/init.d
+    install -v -m755 bootscripts/${bootscript} ${LFS}/etc/rc.d/init.d
 done
 
 # Creating runlevels links
@@ -38,17 +34,20 @@ bootscript_add_rcsysinit mountkernfs 15 00
 bootscript_add_rcsysinit modules     20 00
 bootscript_add_rcsysinit udev        25 00
 bootscript_add_rcsysinit checkfs     30 00
-bootscript_add_rcsysinit mountfs     35 95
-bootscript_add_rcsysinit swap        40 94
+bootscript_add_rcsysinit mountfs     35 00
+bootscript_add_rcsysinit swap        40 00
 bootscript_add_rcsysinit cleanfs     45 00
-bootscript_add_rcsysinit setclock    60 92
 
 # rc0.d
-bootscript_add_manual 0 sendsignals 95 00
+bootscript_add_manual 0 sendsignals 60 00
+bootscript_add_manual 0 swap        65 00
+bootscript_add_manual 0 mountfs     70 00
 bootscript_add_manual 0 halt        99 00
 
 # rc6.d is almost identical to rc0.d
-bootscript_add_manual 6 sendsignals 95 00
+bootscript_add_manual 6 sendsignals 60 00
+bootscript_add_manual 6 swap        65 00
+bootscript_add_manual 6 mountfs     70 00
 bootscript_add_manual 6 reboot      99 00
 
 exit $?