From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 27 Dec 2006 15:49:07 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-2.0.0~69
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2a1e4a884db98e9b3797057c128ea1368beabe8f;p=bacula%2Frescue

Update
---

diff --git a/rescue/linux/cdrom/Makefile.in b/rescue/linux/cdrom/Makefile.in
index 7bf1349..22289c2 100644
--- a/rescue/linux/cdrom/Makefile.in
+++ b/rescue/linux/cdrom/Makefile.in
@@ -102,9 +102,11 @@ clean:
 	@rm -f roottree/etc/modules.conf roottree/etc/syslog.conf
 	@rm -rf roottree/etc/pam.d roottree/etc/ssh
 	@rm -rf roottree/etc/security roottree/etc/init.d
+	@rm -rf roottree/etc/rc.d
 	@rm -rf roottree/etc/udev roottree/etc/modprobe.conf
-	@rm -rf roottree/etc/dev.d roottre/etc/hotplug roottree/etc/modeprob.d
-	@rm -rf roottree/etc/sysconfig roottre/etc/syslog-ng
+	@rm -rf roottree/etc/dev.d roottre/etc/hotplug roottree/etc/modprobe.d
+	@rm -rf roottree/etc/modprobe.conf.local roottree/etc/hotplug
+	@rm -rf roottree/etc/sysconfig roottree/etc/syslog-ng
 	@rm -rf roottree/bacula-*
 	@rm -f cdtree/boot/isolinux/initrd.img
 	@rm -f cdtree/boot/isolinux/isolinux.cfg
diff --git a/rescue/linux/cdrom/roottree/etc/inittab b/rescue/linux/cdrom/roottree/etc/inittab
index e245f85..0bf95f3 100644
--- a/rescue/linux/cdrom/roottree/etc/inittab
+++ b/rescue/linux/cdrom/roottree/etc/inittab
@@ -18,17 +18,17 @@
 id:2:initdefault:
 
 # System initialization.
-si::sysinit:/etc/rc.d/rc.sysinit
+si::sysinit:/etc/sysinit
 
 #shutdown
 l0:0:wait:/sbin/halt -fd  
 
 # normal run levels
 l1:1:wait:/bin/bash -i -l
-l2:2:wait:/etc/rc.d/rc 2
-l3:3:wait:/etc/rc.d/rc 3
-l4:4:wait:/etc/rc.d/rc 4
-l5:5:wait:/etc/rc.d/rc 5
+l2:2:wait:/etc/rc 2
+l3:3:wait:/etc/rc 3
+l4:4:wait:/etc/rc 4
+l5:5:wait:/etc/rc 5
 
 # reboot
 l6:6:wait:/sbin/reboot -fd
@@ -38,8 +38,8 @@ ca::ctrlaltdel:/sbin/halt -d
 
 
 # Run gettys in standard runlevels
-#1:2345:respawn:/bin/sh
-2:2345:respawn:/bin/sh
+1:2345:respawn:/bin/sh
+#2:2345:respawn:/bin/sh
 #3:2345:respawn:/bin/sh
 #4:2345:respawn:/bin/sh
 #5:2345:respawn:/bin/sh
diff --git a/rescue/linux/cdrom/roottree/etc/rc b/rescue/linux/cdrom/roottree/etc/rc
new file mode 100755
index 0000000..84c6b1d
--- /dev/null
+++ b/rescue/linux/cdrom/roottree/etc/rc
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+#  Bacula's version of what is usually in /etc/rc.d/rc -- pretty much empty
+#
+# Start/stop services when switching run levels
+#
+exit 0
diff --git a/rescue/linux/cdrom/roottree/etc/sysinit b/rescue/linux/cdrom/roottree/etc/sysinit
index da71eca..bdcfec8 100755
--- a/rescue/linux/cdrom/roottree/etc/sysinit
+++ b/rescue/linux/cdrom/roottree/etc/sysinit
@@ -1,6 +1,9 @@
 #!/bin/sh
+#
+# Bacula's version of what is ususally in /etc/rc.d/rc.sysinit
+#
 
-echo "Start sysinit ..."
+echo "Start Bacula sysinit ..."
 
 PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"
 export PATH
@@ -31,7 +34,7 @@ touch  /var/run/utmp /var/run/wtmp /var/log/wtmp
 chgrp utmp /var/run/utmp /var/log/wtmp
 chmod 0664 /var/run/utmp /var/log/wtmp
 
-syslogd -m 0
+[ -x /sbin/syslogd ] && syslogd -m 0
 klogd -x 
 
 echo "Attempting to mount CDDOM..."
diff --git a/rescue/linux/cdrom/roottree/init b/rescue/linux/cdrom/roottree/init
index 43cbb3a..d843649 100755
--- a/rescue/linux/cdrom/roottree/init
+++ b/rescue/linux/cdrom/roottree/init
@@ -3,7 +3,7 @@
 # First script called by Linux when booting
 #
 
-echo "======== init called ========"
+echo "Start Bacula init ..."
 sbin/sleep 3
 # sbin/chroot .
 #trap "" 1 2 3 15
@@ -18,20 +18,11 @@ sbin/mknod /dev/null c 1 3
 sbin/mknod /dev/zero c 1 5
 sbin/mkdir /dev/pts
 sbin/mkdir /dev/shm
-echo Starting udev
-sbin/udevstart
+if [ -x sbin/udevstart ] ; then
+   echo Starting udev
+   sbin/udev/start
+fi
 echo -n "/sbin/hotplug" > /proc/sys/kernel/hotplug
-echo "Loading scsi_mod.ko module"
-sbin/insmod /lib/scsi_mod.ko 
-echo "Loading sd_mod.ko module"
-sbin/insmod /lib/sd_mod.ko 
-echo "Loading aic7xxx.ko module"
-sbin/insmod /lib/aic7xxx.ko 
-echo "Loading libata.ko module"
-sbin/insmod /lib/libata.ko 
-echo "Loading ata_piix.ko module"
-sbin/insmod /lib/ata_piix.ko 
-sbin/udevstart
 
 # CMDLINE=`cat /proc/cmdline`
 # DEBUG=""