livecd: linuxrc - busybox should be able to mount squashfs now - c...

[havner]

Author: havner                       Date: Mon Jul 10 14:02:29 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- busybox should be able to mount squashfs now
- cosmetics

---- Files affected:
livecd:
   linuxrc (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: livecd/linuxrc
diff -u livecd/linuxrc:1.21 livecd/linuxrc:1.22
--- livecd/linuxrc:1.21	Fri Jun 23 17:27:14 2006
+++ livecd/linuxrc	Mon Jul 10 16:02:24 2006
@@ -66,7 +66,6 @@
 	echo 5 > /proc/sys/kernel/printk
 fi
 
-echo "${BLUE}Loading modules${NORMAL}"
 modprobe cdrom > $LOG 2>&1
 modprobe loop > $LOG 2>&1
 modprobe isofs > $LOG 2>&1
@@ -77,7 +76,7 @@
 echo "${YELLOW}Autodetecting SCSI controller(s):${NORMAL}"
 COUNT=0
 SCSI=0
-for I in `detect /pci/scsi.pci.in | uniq`; do
+for I in `detect /pci/scsi.pci | uniq`; do
 	SCSI=1
 	echo "SCSI${COUNT}:   $I"
 	modprobe ${I} > $LOG 2>&1
@@ -90,7 +89,7 @@
 echo "${YELLOW}Autodetecting SATA controller(s):${NORMAL}"
 COUNT=0
 SATA=0
-for I in `detect /pci/sata.pci.in | uniq`; do
+for I in `detect /pci/sata.pci | uniq`; do
 	SATA=1
 	echo "SATA${COUNT}:   $I"
 	modprobe ${I} > $LOG 2>&1
@@ -100,7 +99,7 @@
 	echo "None known SATA controller found"
 fi
 
-if [ "${SCSI}" = "1" ] || [ "${SATA}" = "1" ]; then
+if [ "${SCSI}" = "1" -o "${SATA}" = "1" ]; then
 	echo "${BLUE}Loading SCSI/SATA modules${NORMAL}"
 	modprobe sr_mod > $LOG 2>&1
 	modprobe sd_mod > $LOG 2>&1
@@ -110,7 +109,7 @@
 echo "${YELLOW}Autodetecting IDE controller(s):${NORMAL}"
 COUNT=0
 IDE=0
-for I in `detect /pci/ide.pci.in | uniq`; do
+for I in `detect /pci/ide.pci | uniq`; do
 	IDE=1
 	echo "IDE${COUNT}:    $I"
 	modprobe ${I} > $LOG 2>&1
@@ -200,9 +199,11 @@
 	umount -n /rootfs/media/LiveCD > $LOG 2>&1
 	rm -rf /rootfs/media/LiveCD
 	echo "${YELLOW}Done, you can now eject your cdrom${NORMAL}"
-	mount2 /rootfs/pldcd
+	mount -n -t squashfs -o ro,loop=/dev/loop7 /rootfs/pldcd /rootfs/live
+	#mount2 /rootfs/pldcd
 else
-	mount2 /rootfs/media/LiveCD/pldcd
+	mount -n -t squashfs -o ro,loop=/dev/loop7 /rootfs/media/LiveCD/pldcd /rootfs/live
+	#mount2 /rootfs/media/LiveCD/pldcd
 fi
 
 if getparam X > /dev/null || getparam x > /dev/null; then
@@ -225,5 +226,4 @@
 mkdir initrd
 pivot_root . initrd
 
-#/bin/echo "${BLUE}Starting init${NORMAL}"
 exec /usr/sbin/chroot . /sbin/init ${INITPARAM} <dev/console >dev/console 2>&1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/livecd/linuxrc?r1=1.21&r2=1.22&f=u