# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1205067503 0
# Node ID 5b4e22afe7993b5cf069dd7b5913954fe1af9ac4
# Parent  401917ccfc5ab7e58a6ccaad9bc12f891a6351c2
Slitaz-loram: support both cromfs and squashfs

diff -r 401917ccfc5a -r 5b4e22afe799 slitaz-loram/receipt
--- a/slitaz-loram/receipt	Sun Mar 09 12:15:39 2008 +0100
+++ b/slitaz-loram/receipt	Sun Mar 09 12:58:23 2008 +0000
@@ -24,11 +24,11 @@
     i=$(($i-1))
     tag=$(grep "$tag" $1/etc/init.d/rcS)
     if [ "$2" = "-R" ]; then
-    	line="-$(($i-13)),15 +$(($i-13)),2"
+    	line="-$(($i-21)),23 +$(($i-21)),2"
 	i="-"
     else
-        grep -q 'if [ -f /.usr.cromfs ]; then' $1/etc/init.d/rcS && return
-    	line="-$i,2 +$i,15"
+        grep -q 'from slitaz-loram package' $1/etc/init.d/rcS && return
+    	line="-$i,2 +$i,23"
 	i="+"
     fi
     patch -p0 <<EOF
@@ -36,15 +36,23 @@
 +++ $1/etc/init.d/rcS
 @@ $line @@
  
-$i# Mount compressed /usr
-$i if [ -f /.usr.cromfs ]; then
+$i# Mount compressed /usr (from slitaz-loram package)
+$i if [ -f /.usr.cromfs -o -f /.usr.sqfs ]; then
+$i	usr=usr
+$i	echo -n "Mounting /usr read-"
 $i	if [ -d /.usr.rw ]; then
-$i		echo -n "Mounting compressed /usr read-write... "
-$i		/bin/cromfs-driver /.usr.cromfs /.usr.ro
+$i		usr=.usr.ro
+$i		echo -n "write... "
+$i	else
+$i		echo -n "only... "
+$i	fi
+$i	if [ -f /.usr.cromfs ]; then
+$i		/bin/cromfs-driver /.usr.cromfs /\$usr
+$i	else
+$i		/bin/mount -o loop,ro -t squashfs /.usr.sqfs /\$usr
+$i	fi
+$i	if [ -d /.usr.rw ]; then
 $i		/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other NONE /usr
-$i	else
-$i		echo -n "Mounting compressed /usr read-only... "
-$i		/bin/cromfs /.usr.cromfs /usr
 $i	fi
 $i	status
 $i fi
@@ -58,20 +66,27 @@
 pre_install()
 {
     local i
+    . /etc/tazlito/tazlito.conf
     for i in $(cd /var/lib/tazpkg/installed ; ls -d slitaz-loram* 2> /dev/null); do
         [ "$i" = "$PACKAGE" ] && continue
         yes y | tazpkg remove $i
+	rm -f $PACKAGES_REPOSITORY/slitaz-boot-scripts-*.tazpkg 2> /dev/null
     done
 }
 
 post_install()
 {
-    set_patch "$1"
+    local root
+    root=$1
+    set_patch "$root"
     if [ ! -x /bin/funionfs ]; then
         cat <<EOF
+----
 You will build a live CD with /usr mounted read-only.
-You can install funionfs to have read-write access to /usr with:
+You can install funionfs to have read-write access into /usr with:
+
 # tazpkg get-install funionfs
+
 EOF
     fi
 }
diff -r 401917ccfc5a -r 5b4e22afe799 slitaz-loram/stuff/loram.extract
--- a/slitaz-loram/stuff/loram.extract	Sun Mar 09 12:15:39 2008 +0100
+++ b/slitaz-loram/stuff/loram.extract	Sun Mar 09 12:58:23 2008 +0000
@@ -1,7 +1,14 @@
-cromfs=".usr.cromfs"
 rmdir usr
-bin/unmkcromfs $cromfs usr
-rm -f $cromfs
+packedfs=".usr.cromfs"
+if [ -f $packedfs ]; then
+	bin/unmkcromfs $packedfs usr
+	rm -f $packedfs
+fi
+packedfs=".usr.shfs"
+if [ -f $packedfs ]; then
+	sbin/unsquashfs -d usr $packedfs
+	rm -f $packedfs
+fi
 ( cd usr/.moved ; find * -print ) | \
 while read file; do
 	[ -L "$file" ] || continue
diff -r 401917ccfc5a -r 5b4e22afe799 slitaz-loram/stuff/loram.rootfs
--- a/slitaz-loram/stuff/loram.rootfs	Sun Mar 09 12:15:39 2008 +0100
+++ b/slitaz-loram/stuff/loram.rootfs	Sun Mar 09 12:58:23 2008 +0000
@@ -1,7 +1,8 @@
 echo "$(du -hs ./usr | cut -f1) were used by /usr"
 for ii in /sbin /lib /bin; do
   mkdir -p ./usr/.moved$ii
-  for j in e2fsprogs pcmciautils cpio syslinux-extra isapnptools ncurses; do
+  for j in e2fsprogs pcmciautils cpio syslinux-extra isapnptools ncurses \
+	   libcap; do
     for k in $(grep ^$ii ./var/lib/tazpkg/installed/$j/files.list) ; do
       [ -f .$k ] || continue
       mv .$k ./usr/.moved$k
@@ -17,7 +18,11 @@
 done
 echo "$(du -hs ./usr/.moved | cut -f1) have been moved into /usr"
 echo "$(du -hs ./usr | cut -f1) were used by /usr before compression"
-usr/bin/mkcromfs -qq -f 262144 -b 16384 usr .usr.cromfs
+if [ -x usr/bin/mkcromfs ]; then
+  usr/bin/mkcromfs -qq -f 262144 -b 16384 usr .usr.cromfs
+else
+  usr/sbin/mksquashfs usr .usr.sqfs
+fi
 if [ -x bin/funionfs ]; then
   mkdir .usr.ro .usr.rw
   ln -s /.usr.ro/lib/$(cd usr/lib ; ls libfuse.so.2.*) lib/libfuse.so.2
@@ -25,4 +30,4 @@
 rm -rf usr
 mkdir usr
 COMPRESSION="none"
-echo "$(du -hs ./.usr.cromfs | cut -f1) are used by /usr after compression"
+echo "$(du -hs ./.usr.*fs | cut -f1) are used by /usr after compression"