[Devil-linux-commit] build/config/etc/initrd mount_cdrom,1.25.2.2,1.25.2.3

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

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

Modified Files:
      Tag: rel-1-2-patches
	mount_cdrom 
Log Message:
remote update was broken


Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -u -d -r1.25.2.2 -r1.25.2.3
--- mount_cdrom	11 Jan 2005 00:57:45 -0000	1.25.2.2
+++ mount_cdrom	22 Apr 2005 19:20:13 -0000	1.25.2.3
@@ -84,8 +84,8 @@
 				$RED
 				rm -f /mnt/bootcd.iso &> /dev/null
 				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
+				    # create flag file, so the other scripts know about it
+				    touch /shm/dl_iso_replaced
                                     $BLUE
                                     echo "Upgrading System Boot Files"
                                     $NORMAL
@@ -97,7 +97,14 @@
                                     sync
 				    umount /cdrom &> /dev/null
                                     umount /mnt &> /dev/null
-                                    $RED
+                                    
+                                    $GREEN
+                                    echo "Mounting old version"
+                                    $NORMAL
+				    mount -o loop -t iso9660 /mnt/bootcd.iso.old $1 || return 1
+				    echo $disk > /shm/DL_DEVICE
+				    dl_version=`cat /mnt/DEVIL-LINUX 2> /dev/null`
+                                    exit 0
 				else
 					echo "Activation failed"
 				fi