[Devil-linux-commit] build/config/etc/initrd linuxrc,1.70.2.1,1.70.2.2 mount_cdrom,1.25.2.1,1.25.2.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10202/etc/initrd

Modified Files:
      Tag: rel-1-2-patches
	linuxrc mount_cdrom 
Log Message:
we need to reboot earlier


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.70.2.1
retrieving revision 1.70.2.2
diff -u -d -r1.70.2.1 -r1.70.2.2
--- linuxrc	9 Jan 2005 21:25:37 -0000	1.70.2.1
+++ linuxrc	11 Jan 2005 00:57:45 -0000	1.70.2.2
@@ -275,6 +275,17 @@
 
 mkdir -p /shm/root
 
+# check if the DL ISO got upgraded
+if [ -e /cdrom/shm/dl_iso_replaced ]; then
+    cd /cdrom
+    #change to new root
+    pivot_root . initrd
+    $RED
+    echo "Rebooting..."
+    $NORMAL
+    exec /bin/chroot . /sbin/reboot -f
+fi			
+
 echo "loading configuration"
 tar -C /shm -xjf /floppy/$DL_CONFIG_FILE
 
@@ -357,15 +368,7 @@
 
 #change to new root and start up the real system
 pivot_root . initrd
-# check if the DL ISO got upgraded
-if [ -e /cdrom/shm/dl_iso_replaced ]; then
-    $RED
-    echo "Rebooting..."
-    $NORMAL
-    exec /bin/chroot . /sbin/reboot -f
-else
-    exec /bin/chroot . /sbin/pre_init $DL_CONFIG_SOURCE $DL_CONFIG_FILE $@ <dev/console >dev/console 2>&1
-fi			
+exec /bin/chroot . /sbin/pre_init $DL_CONFIG_SOURCE $DL_CONFIG_FILE $@ <dev/console >dev/console 2>&1
 
 # something went wrong
 echo

Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -d -r1.25.2.1 -r1.25.2.2
--- mount_cdrom	9 Jan 2005 21:25:37 -0000	1.25.2.1
+++ mount_cdrom	11 Jan 2005 00:57:45 -0000	1.25.2.2
@@ -95,7 +95,8 @@
                                     cp -fp /cdrom/boot/* /mnt/boot/ 2> /dev/null
                                     cp -fp /cdrom/DEVIL-LINUX /mnt/
                                     sync
-                                    umount /mnt/ &> /dev/null
+				    umount /cdrom &> /dev/null
+                                    umount /mnt &> /dev/null
                                     $RED
 				else
 					echo "Activation failed"