# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1211321499 0
# Node ID a3a3c2bac53dad13f0f81809547ef81809c9971d
# Parent  25066eeb8547b9e76e9499f6931c26ffa5794bff
Slitaz-loram-cdrom: fix squashfs case

diff -r 25066eeb8547 -r a3a3c2bac53d slitaz-loram-cdrom/receipt
--- a/slitaz-loram-cdrom/receipt	Tue May 20 18:35:02 2008 +0000
+++ b/slitaz-loram-cdrom/receipt	Tue May 20 22:11:39 2008 +0000
@@ -65,8 +65,8 @@
 $i	if [ -f \$FS ]; then
 $i		release_cdrom
 $i		/bin/cromfs-driver \$FS /\$usr
-$i	FS=/cdrom/usr.sqfs
-$i	elif [ -f \$FS ]; then
+$i	elif [ -f /cdrom/usr.sqfs ]; then
+$i		FS=/cdrom/usr.sqfs
 $i		release_cdrom
 $i		mount -o loop,ro -t squashfs \$FS /\$usr
 $i	elif [ -L /\$usr ]; then
diff -r 25066eeb8547 -r a3a3c2bac53d slitaz-loram-cdrom/stuff/loram.extract
--- a/slitaz-loram-cdrom/stuff/loram.extract	Tue May 20 18:35:02 2008 +0000
+++ b/slitaz-loram-cdrom/stuff/loram.extract	Tue May 20 22:11:39 2008 +0000
@@ -1,6 +1,6 @@
 # remove link to cdrom
 [ -d cdrom ] && rmdir cdrom
-rm -f bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink
+rm -f bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free
 if [ -L usr ]; then
 	rm usr
 	cp -a $1/usr .
diff -r 25066eeb8547 -r a3a3c2bac53d slitaz-loram-cdrom/stuff/loram.rootfs
--- a/slitaz-loram-cdrom/stuff/loram.rootfs	Tue May 20 18:35:02 2008 +0000
+++ b/slitaz-loram-cdrom/stuff/loram.rootfs	Tue May 20 22:11:39 2008 +0000
@@ -45,39 +45,41 @@
   [ "$usr" = "usr" ] || mv $usr usr
   ln -s /cdrom/usr $usr
 fi
-for ii in *; do
-  case "$ii" in
-  usr|boot) continue;;
-  mnt|media|sys|proc|cdrom) mkdir ../rootcd/$ii;;
-  *) cp -a $ii ../rootcd/$ii;;
-  esac
-done
-for ii in keymap.conf locale.conf resolv.conf TZ motd; do
-  ln -s /tmp/$ii ../rootcd/etc
-done
-for ii in log run lock; do
-  mv ../rootcd/var/$ii ../rootcd/var/$ii.ORG
-  ln -s /tmp/$ii ../rootcd/var
-done
-mv ../rootcd/root ../rootcd/root.ORG
-ln -s /tmp ../rootcd/root
-ln -s / ../rootcd/media/cdrom
-mkdir ../rootcd/mnt/target
-sed -i 's/CLEAN_UP_SYSTEM="yes"/CLEAN_UP_SYSTEM="no"/' ../rootcd/etc/rcS.conf
-sed -i 's/RUN_DAEMONS=.*/RUN_DAEMONS=""/' ../rootcd/etc/rcS.conf
-for ii in ../rootcd/boot/isolinux/*.cfg; do
-  cat $ii | awk '{ print } /append/ { printf "label loram\n\tkernel /boot/bzImage\n\tappend ro sound=noconf screen=text %s %s %s\n",$5,$6,$7 }' > $ii.tmp
-  mv -f $ii.tmp $ii
-done
-cat >> ../rootcd/boot/isolinux/enopts.txt <<EOT
+if [ -d ../rootcd/usr/lib ]; then
+  for ii in *; do
+    case "$ii" in
+    usr|boot) continue;;
+    mnt|media|sys|proc|cdrom) mkdir ../rootcd/$ii;;
+    *) cp -a $ii ../rootcd/$ii;;
+    esac
+  done
+  for ii in keymap.conf locale.conf resolv.conf TZ motd; do
+    ln -s /tmp/$ii ../rootcd/etc
+  done
+  for ii in log run lock; do
+    mv ../rootcd/var/$ii ../rootcd/var/$ii.ORG
+    ln -s /tmp/$ii ../rootcd/var
+  done
+  mv ../rootcd/root ../rootcd/root.ORG
+  ln -s /tmp ../rootcd/root
+  ln -s / ../rootcd/media/cdrom
+  mkdir ../rootcd/mnt/target
+  sed -i 's/CLEAN_UP_SYSTEM="yes"/CLEAN_UP_SYSTEM="no"/' ../rootcd/etc/rcS.conf
+  sed -i 's/RUN_DAEMONS=.*/RUN_DAEMONS=""/' ../rootcd/etc/rcS.conf
+  for ii in ../rootcd/boot/isolinux/*.cfg; do
+    cat $ii | awk '{ print } /append/ { printf "label loram\n\tkernel /boot/bzImage\n\tappend ro sound=noconf screen=text %s %s %s\n",$5,$6,$7 }' > $ii.tmp
+    mv -f $ii.tmp $ii
+  done
+  cat >> ../rootcd/boot/isolinux/enopts.txt <<EOT
  With few RAM, you can use loram entry with the cdrom device; example:
  boot: loram root=/dev/hdc
 EOT
-cat >> ../rootcd/boot/isolinux/options.txt <<EOT
+  cat >> ../rootcd/boot/isolinux/options.txt <<EOT
  Avec peu de RAM, utilisez l'entrée loram en précisant le cdrom, exemple:
  boot: loram root=/dev/hdc
 EOT
-for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink ; do
+fi
+for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free; do
   ln -s busybox $ii
 done
 mkdir cdrom