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

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

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

Modified Files:
      Tag: rel-1-2-patches
	linuxrc mount_cdrom 
Log Message:
- remote update now copies everything in initrd and reboot from within
linuxrc


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.70
retrieving revision 1.70.2.1
diff -u -d -r1.70 -r1.70.2.1
--- linuxrc	17 May 2004 23:05:35 -0000	1.70
+++ linuxrc	9 Jan 2005 21:25:37 -0000	1.70.2.1
@@ -357,7 +357,15 @@
 
 #change to new root and start up the real system
 pivot_root . initrd
-exec /bin/chroot . /sbin/pre_init $DL_CONFIG_SOURCE $DL_CONFIG_FILE $@ <dev/console >dev/console 2>&1
+# 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			
 
 # something went wrong
 echo

Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -d -r1.25 -r1.25.2.1
--- mount_cdrom	17 May 2004 23:05:35 -0000	1.25
+++ mount_cdrom	9 Jan 2005 21:25:37 -0000	1.25.2.1
@@ -86,6 +86,17 @@
 				if mv /mnt/bootcd.iso.new /mnt/bootcd.iso ; then
 					# create flag file, so the other scripts know about it
 					touch /shm/dl_iso_replaced
+                                    $BLUE
+                                    echo "Upgrading System Boot Files"
+                                    $NORMAL
+
+                                    mount -o loop -t iso9660 /mnt/bootcd.iso /cdrom
+
+                                    cp -fp /cdrom/boot/* /mnt/boot/ 2> /dev/null
+                                    cp -fp /cdrom/DEVIL-LINUX /mnt/
+                                    sync
+                                    umount /mnt/ &> /dev/null
+                                    $RED
 				else
 					echo "Activation failed"
 				fi