From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 28 Dec 2006 09:39:53 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-2.0.0~68
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=012674a515f629efade1cf375540b535e43fc513;p=bacula%2Frescue

Update
---

diff --git a/rescue/linux/cdrom/roottree/etc/inittab b/rescue/linux/cdrom/roottree/etc/inittab
index 0bf95f3..64c6624 100644
--- a/rescue/linux/cdrom/roottree/etc/inittab
+++ b/rescue/linux/cdrom/roottree/etc/inittab
@@ -25,6 +25,7 @@ l0:0:wait:/sbin/halt -fd
 
 # normal run levels
 l1:1:wait:/bin/bash -i -l
+#l1:1:wait:/etc/rc 1
 l2:2:wait:/etc/rc 2
 l3:3:wait:/etc/rc 3
 l4:4:wait:/etc/rc 4
@@ -38,11 +39,7 @@ ca::ctrlaltdel:/sbin/halt -d
 
 
 # Run gettys in standard runlevels
-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
+1:2345:respawn:/bin/bash -l -i
 #1:2345:respawn:/sbin/mingetty tty1
 #2:2345:respawn:/sbin/mingetty tty2
 #3:2345:respawn:/sbin/mingetty tty3
diff --git a/rescue/linux/cdrom/roottree/etc/rc b/rescue/linux/cdrom/roottree/etc/rc
index 84c6b1d..285734f 100755
--- a/rescue/linux/cdrom/roottree/etc/rc
+++ b/rescue/linux/cdrom/roottree/etc/rc
@@ -4,4 +4,10 @@
 #
 # Start/stop services when switching run levels
 #
+argv1="$1"
+
+if [ $argv1 -eq 1 ] ; then
+   exec init -t1 S
+fi
+
 exit 0
diff --git a/rescue/linux/cdrom/roottree/etc/start_network.sh b/rescue/linux/cdrom/roottree/etc/start_network.sh
index 65a22fe..9df7ab3 100755
--- a/rescue/linux/cdrom/roottree/etc/start_network.sh
+++ b/rescue/linux/cdrom/roottree/etc/start_network.sh
@@ -7,16 +7,18 @@
 #  dhcpcd below to dhclient if you are running RedHat
 #
 
-if ifconfig eth0 >/dev/null 2>&1 ; then
+DHCPCD=/bin/dhcpcd
+if [ ! -x $DHCPCD ] ; then
+   DHCPCD=/bin/dhclient
+fi
 
+if ifconfig eth0 >/dev/null 2>&1 ; then
     echo "Setting up network..."
-    /bin/dhcpcd $eth0
-
+    $DHCPCD eth0
     echo "done"
 
     ifconfig
     exit
-
 fi
 
 echo "No network card present, cannot configure network"
diff --git a/rescue/version.h b/rescue/version.h
index 3237b71..bbef25d 100644
--- a/rescue/version.h
+++ b/rescue/version.h
@@ -1,5 +1,5 @@
 /* */
 #undef  VERSION
 #define VERSION "2.0.0"
-#define BDATE   "25 December 2006"
-#define LSMDATE "25Dec06"
+#define BDATE   "28 December 2006"
+#define LSMDATE "28Dec06"