kadischi/linuxrc livecd-linuxrc,1.3,1.4

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/linuxrc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27635/kadischi/linuxrc

Modified Files:
	livecd-linuxrc 
Log Message:
Use SquashFS exclusively, major tidying of kadischi.py


Index: livecd-linuxrc
===================================================================
RCS file: /cvs/devel/kadischi/linuxrc/livecd-linuxrc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- livecd-linuxrc	30 Mar 2006 10:13:12 -0000	1.3
+++ livecd-linuxrc	11 Apr 2006 08:26:16 -0000	1.4
@@ -17,15 +17,10 @@
 # Make kernel don't mount root fs
 echo 0x100 > /proc/sys/kernel/real-root-dev
 
-# Check for squashfs file
-if [ -f /cdrom/kadischi.sqsh ]; then
-    echo "Mounting squashfs filesystem"
-    modprobe loop
-    modprobe squashfs
-    mount -t squashfs -o loop /cdrom/kadischi.sqsh /sysroot
-else
-    mount -o bind /cdrom /sysroot
-fi
+echo "Mounting root filesystem"
+modprobe loop
+modprobe squashfs
+mount -t squashfs -oloop,ro /cdrom/kadischi.sqsh /sysroot
 
 echo "Doing the pivot_root"
 cd /sysroot