kadischi/linuxrc livecd-linuxrc,1.1.1.1,1.2

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	livecd-linuxrc 
Log Message:
Contributor: Toshio Kuratomi(SquashFS functionality as optional ), other minor fixes of unneccessary dependants on installed files.


Index: livecd-linuxrc
===================================================================
RCS file: /cvs/devel/kadischi/linuxrc/livecd-linuxrc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- livecd-linuxrc	21 Aug 2005 17:09:00 -0000	1.1.1.1
+++ livecd-linuxrc	30 Mar 2006 04:29:21 -0000	1.2
@@ -12,11 +12,21 @@
 
 cd /
 
-find-live-cd /sysroot
+find-live-cd /cdrom
 
 # 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 --bind /cdrom /sysroot
+fi
+
 echo "Doing the pivot_root"
 cd /sysroot
 pivot_root /sysroot /sysroot/initrd
@@ -45,4 +55,4 @@
 echo "Setting up readonly-root"
 /etc/rc.readonly linuxrc
 
-# rc.readonly will umount both /initrd/tmp and /initrd
\ No newline at end of file
+# rc.readonly will umount both /initrd/tmp and /initrd