[Devil-linux-commit] build/config/etc/initrd linuxrc,1.77,1.78 mount_cdrom,1.27,1.28

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

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

Modified Files:
	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.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- linuxrc	9 Jan 2005 23:22:27 -0000	1.77
+++ linuxrc	11 Jan 2005 00:57:16 -0000	1.78
@@ -282,6 +282,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
 
@@ -363,15 +374,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.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mount_cdrom	9 Jan 2005 21:31:31 -0000	1.27
+++ mount_cdrom	11 Jan 2005 00:57:16 -0000	1.28
@@ -89,7 +89,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"