Changeset 866fbaa

Timestamp:

Feb 21, 2006, 2:04:57 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

de4ea80

Parents:

a54d633

Message:

r1026@server (orig r1024): jim | 2006-01-08 15:20:31 -0800

r1318@server: jim | 2006-01-08 15:16:53 -0800
Stripped down the bootscripts to the base only

Location:

bootscripts

Files:

• Makefile (modified) (8 diffs)
• contrib/enhanced/README (deleted)
• contrib/enhanced/init.d/functions (deleted)
• contrib/enhanced/init.d/rc (deleted)
• contrib/enhanced/sysconfig/rc (deleted)
• contrib/livecd/hotplug (deleted)
• contrib/livecd/mountsqfs (deleted)
• contrib/livecd/network (deleted)
• contrib/livecd/startup (deleted)
• contrib/lsb/Makefile (deleted)
• contrib/lsb/lib/init-functions (deleted)
• lfs/init.d/checkfs (modified) (2 diffs)

bootscripts/Makefile

@@ -28 +28 @@
         install -m ${MODE} lfs/init.d/halt          ${EXTDIR}/rc.d/init.d/
         install -m ${MODE} lfs/init.d/console       ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} lfs/init.d/hotplug       ${EXTDIR}/rc.d/init.d/
         install -m ${MODE} lfs/init.d/localnet      ${EXTDIR}/rc.d/init.d/
         install -m ${MODE} lfs/init.d/modules       ${EXTDIR}/rc.d/init.d/
@@ -42 +41 @@
         install -m ${MODE} lfs/init.d/sysctl        ${EXTDIR}/rc.d/init.d/
         install -m ${MODE} lfs/init.d/template      ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} lfs/init.d/udev          ${EXTDIR}/rc.d/init.d/
         ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc0.d/K80network
         ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc0.d/K90sysklogd
-        ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rc0.d/S50hotplug
         ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
         ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rc0.d/S70mountfs
@@ -63 +60 @@
         ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc6.d/K80network
         ln -sf ../init.d/sysklogd   ${EXTDIR}/rc.d/rc6.d/K90sysklogd
-        ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rc6.d/S50hotplug
         ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals
         ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rc6.d/S70mountfs
@@ -71 +67 @@
         ln -sf ../init.d/mountkernfs ${EXTDIR}/rc.d/rcsysinit.d/S00mountkernfs
         ln -sf ../init.d/modules     ${EXTDIR}/rc.d/rcsysinit.d/S05modules
-        ln -sf ../init.d/udev        ${EXTDIR}/rc.d/rcsysinit.d/S10udev
         ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rcsysinit.d/S20swap
         ln -sf ../init.d/checkfs     ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
         ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
         ln -sf ../init.d/cleanfs     ${EXTDIR}/rc.d/rcsysinit.d/S50cleanfs
-        ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rcsysinit.d/S55hotplug
         ln -sf ../init.d/setclock    ${EXTDIR}/rc.d/rcsysinit.d/S60setclock
         ln -sf ../init.d/console     ${EXTDIR}/rc.d/rcsysinit.d/S70console
@@ -95 +89 @@
         install --backup=numbered -m ${CONFMODE} contrib/sysconfig/consolelog  ${EXTDIR}/sysconfig/
 
-install-lsb-compliant:
-        make -C contrib/lsb
-
 install-service-mtu: create-service-dir
         install -m ${MODE} contrib/sysconfig/network-devices/services/mtu ${EXTDIR}/sysconfig/network-devices/services
-
-install-livecd: create-dirs create-service-dir
-        install -m ${CONFMODE} lfs/init.d/functions ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} lfs/init.d/halt          ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} lfs/init.d/console       ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} contrib/livecd/hotplug   ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} lfs/init.d/localnet      ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} lfs/init.d/rc            ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} lfs/init.d/reboot        ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} lfs/init.d/sendsignals   ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} lfs/init.d/setclock      ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} lfs/init.d/sysctl        ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} lfs/init.d/sysklogd      ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} contrib/livecd/startup   ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} contrib/livecd/mountsqfs ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} contrib/livecd/network   ${EXTDIR}/rc.d/init.d/
-        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc0.d/K80network
-        ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rc0.d/S50hotplug
-        ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
-        ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rc0.d/S90localnet
-        ln -sf ../init.d/halt        ${EXTDIR}/rc.d/rc0.d/S99halt
-        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc1.d/K80network
-        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc2.d/K80network
-        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc3.d/S20network
-        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc4.d/S20network
-        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc5.d/S20network
-        ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc6.d/K80network
-        ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rc6.d/S50hotplug
-        ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals
-        ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rc6.d/S90localnet
-        ln -sf ../init.d/reboot      ${EXTDIR}/rc.d/rc6.d/S99reboot
-        ln -sf ../init.d/startup     ${EXTDIR}/rc.d/rcsysinit.d/S00startup
-        ln -sf ../init.d/mountsqfs   ${EXTDIR}/rc.d/rcsysinit.d/S05mountsqfs
-        ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rcsysinit.d/S55hotplug
-        ln -sf ../init.d/setclock    ${EXTDIR}/rc.d/rcsysinit.d/S60setclock
-        ln -sf ../init.d/console     ${EXTDIR}/rc.d/rcsysinit.d/S70console
-        ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rcsysinit.d/S80localnet
-        ln -sf ../init.d/sysctl      ${EXTDIR}/rc.d/rcsysinit.d/S90sysctl
-        if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} lfs/sysconfig/rc          ${EXTDIR}/sysconfig/; fi
-        if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then install -m ${CONFMODE} lfs/sysconfig/createfiles ${EXTDIR}/sysconfig/; fi
-        install                   -m ${MODE} lfs/sysconfig/network-devices/ifup   ${EXTDIR}/sysconfig/network-devices/
-        install                   -m ${MODE} lfs/sysconfig/network-devices/ifdown ${EXTDIR}/sysconfig/network-devices/
-        install                   -m ${MODE} lfs/sysconfig/network-devices/services/ipv4-static       ${EXTDIR}/sysconfig/network-devices/services/
-        install                   -m ${MODE} lfs/sysconfig/network-devices/services/ipv4-static-route ${EXTDIR}/sysconfig/network-devices/services/
 
 minimal: create-dirs create-service-dir
@@ -158 +105 @@
         install -m ${MODE} lfs/init.d/setclock      ${EXTDIR}/rc.d/init.d/
         install -m ${MODE} lfs/init.d/swap          ${EXTDIR}/rc.d/init.d/
-        install -m ${MODE} lfs/init.d/udev          ${EXTDIR}/rc.d/init.d/
         ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
         ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rc0.d/S70mountfs
@@ -168 +114 @@
         ln -sf ../init.d/reboot      ${EXTDIR}/rc.d/rc6.d/S99reboot
         ln -sf ../init.d/mountkernfs ${EXTDIR}/rc.d/rcsysinit.d/S00mountkernfs
-        ln -sf ../init.d/udev        ${EXTDIR}/rc.d/rcsysinit.d/S10udev
         ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rcsysinit.d/S20swap
         ln -sf ../init.d/checkfs     ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
@@ -179 +124 @@
         install                   -m 755 contrib/hotplug/net.agent   ${EXTDIR}/hotplug
 
-install-enhanced:
-        mv ${EXTDIR}/rc.d/init.d/rc ${EXTDIR}/rc.d/init.d/rc-enhanced.bak
-        mv ${EXTDIR}/rc.d/init.d/functions ${EXTDIR}/rc.d/init.d/functions-enhanced.bak
-        mv ${EXTDIR}/sysconfig/rc ${EXTDIR}/sysconfig/rc-enhanced.bak
-        install -d -m ${DIRMODE} /media/boottemp
-        install -m ${MODE} contrib/enhanced/init.d/rc ${EXTDIR}/rc.d/init.d/rc
-        install -m ${CONFMODE} contrib/enhanced/init.d/functions ${EXTDIR}/rc.d/init.d/functions
-        install -m ${CONFMODE} contrib/enhanced/sysconfig/rc ${EXTDIR}/sysconfig/rc
-
 .PHONY: all create-dirs create-service-dir \
         install install-service-mtu install-livecd \
         install-net-agent install-enhanced
-

bootscripts/lfs/init.d/checkfs

@@ -52 +52 @@
                         boot_mesg "" ${NORMAL}
                         read ENTER
-                        /etc/rc.d/init.d/halt stop
+                        ${rc_base}/init.d/halt stop
                 fi
 
@@ -111 +111 @@
                         boot_mesg "" ${NORMAL}
                         read ENTER
-                        /etc/rc.d/init.d/halt stop
+                  ${rc_base}/halt stop
                 fi