[Devil-linux-commit] build/config/etc/initrd linuxrc, 1.106, 1.107 mount_cdrom, 1.49, 1.50

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

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9556/config/etc/initrd

Modified Files:
	linuxrc mount_cdrom 
Log Message:
- corrected problem with booting from an iso image when using pre-unionfs
  config
- added pam_mount 1.18
- added libHX 2.5
- updated samba to 3.2.28


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- linuxrc	20 Feb 2009 20:50:25 -0000	1.106
+++ linuxrc	21 Feb 2009 00:47:01 -0000	1.107
@@ -361,7 +361,7 @@
 $GREEN
 echo "loading configuration"
 $NORMAL
-if [ "$REALLY_LIVE" = "1" ] ; then
+if [ "$REALLY_LIVE" = "1" ]  ; then
     # check to see if cdrom has already been mounted
     if [ ! -e /cdrom/DEVIL-LINUX ] ; then
         # find the CDROM
@@ -373,18 +373,20 @@
     # we unmount here to be able to possibly activate run from ram
     # if that's activated by the default config
     # (bug reported by Dmitry Komarov)
-    sync
-    let i=0
-    while (! umount /cdrom 2>/dev/null) && [ $i -lt 10 ]; do
-        # at least in qemu there exists a race condition
-        # when unmounting the cdrom
-        let i=i+1
-        sleep 1
-    done
+    if [ -e /shm/dl_run_from_ram ] ; then
+	sync
+	let i=0
+	while (! umount /cdrom 2>/dev/null) && [ $i -lt 10 ]; do
+    	    # at least in qemu there exists a race condition
+    	    # when unmounting the cdrom
+    	    let i=i+1
+    	    sleep 1
+	done
     #
     # FIXME - need to solve this in a nicer way as we search for
     #         the cd/image twice which is quite ugly (fl)
     #
+    fi
 else 
     tar -C /shm -xjf /floppy/$DL_CONFIG_FILE
 fi
@@ -398,7 +400,7 @@
 # check to see if cdrom has already been mounted
 if [ ! -e /cdrom/DEVIL-LINUX ] ; then
     # find the CDROM
-    /mount_cdrom /cdrom
+    mount_cdrom /cdrom
     reboot_if_updated
 fi
 

Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- mount_cdrom	29 Jan 2009 02:56:54 -0000	1.49
+++ mount_cdrom	21 Feb 2009 00:47:02 -0000	1.50
@@ -248,6 +248,7 @@
 
         # finally done
         $GREEN; echo 'System is now fully running from RAM'; $NORMAL
+	touch /shm/dl_run_from_ram
         return 0
 }