[Devil-linux-commit] build/config/etc/initrd linuxrc,1.79,1.80 mount_cdrom,1.28,1.29

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

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

Modified Files:
	linuxrc mount_cdrom 
Log Message:
force usage of /dev/loop0 in initrd
removed util-linux patch, this one breaks -t auto


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- linuxrc	11 Jan 2005 01:14:47 -0000	1.79
+++ linuxrc	23 Jan 2005 20:17:29 -0000	1.80
@@ -179,9 +179,6 @@
 # get rid of modprobe warnings
 mkdir -p /shm/etc
 
-echo -e "Loading loop-AES module";
-modprobe loop 2> /dev/null
-
 echo -e "Unpacking udev configuration"
 tar -xzf /udev-cfg.tar.gz -C /shm 
 

Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- mount_cdrom	11 Jan 2005 00:57:16 -0000	1.28
+++ mount_cdrom	23 Jan 2005 20:17:29 -0000	1.29
@@ -84,7 +84,7 @@
     				    echo "Upgrading System Boot Files"
 			            $NORMAL
 			            
-				    mount -o loop -t iso9660 /mnt/bootcd.iso /cdrom
+				    mount -o loop=/dev/loop0 -t iso9660 /mnt/bootcd.iso /cdrom
 				    
 				    cp -fp /cdrom/boot/* /mnt/boot/ 2> /dev/null
 			            cp -fp /cdrom/DEVIL-LINUX /mnt/
@@ -106,7 +106,7 @@
 				# because bootcd.iso is still mounted inside it.
 				# RO will make it less painfull.
 				mount -o remount,ro,noatime $disk 2> /dev/null
-				mount -o loop -t iso9660 /mnt/bootcd.iso $1 || return 1
+				mount -o loop=/dev/loop0 -t iso9660 /mnt/bootcd.iso $1 || return 1
 				echo $disk > /shm/DL_DEVICE
 				dl_version=`cat /mnt/DEVIL-LINUX 2> /dev/null`
 				if [ "$3" != "silent" ]; then