# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1229526541 0
# Node ID f0963019ca5ac094e2ed91d4e6be960965a43a76
# Parent  dad369eb31264970bf05a1f37c3d9f0e9b55f477
slitaz-loram*: add aufs support

diff -r dad369eb3126 -r f0963019ca5a slitaz-loram-cdrom/receipt
--- a/slitaz-loram-cdrom/receipt	Wed Dec 17 14:47:20 2008 +0000
+++ b/slitaz-loram-cdrom/receipt	Wed Dec 17 15:09:01 2008 +0000
@@ -24,11 +24,11 @@
     i=$(($i-1))
     tag=$(grep "$tag" $1/etc/init.d/rcS)
     if [ "$2" = "-R" ]; then
-    	line="-$(($i-49)),51 +$(($i-49)),2"
+    	line="-$(($i-53)),55 +$(($i-53)),2"
 	i="-"
     else
         grep -q 'from slitaz-loram-cdrom package' $1/etc/init.d/rcS && return
-    	line="-$i,2 +$i,51"
+    	line="-$i,2 +$i,55"
 	i="+"
     fi
     patch -p0 <<EOF
@@ -54,7 +54,7 @@
 $i# Mount /usr (from slitaz-loram-cdrom package)
 $i if [ -d /cdrom ]; then
 $i	mount -o ro -t iso9660 /dev/cdrom /cdrom
-$i	if [ -d /.usr.rw -a -x /bin/funionfs ]; then
+$i	if [ -d /.usr.rw ]; then
 $i		echo -n "Mounting /usr read-write... "
 $i		usr=.usr.ro
 $i	else
@@ -80,8 +80,12 @@
 $i		false
 $i	fi
 $i	status 
-$i	if [ -d /.usr.rw -a -x /bin/funionfs ]; then
-$i		/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other -o suid,dev NONE /usr
+$i	if [ -d /.usr.rw ]; then
+$i		if [ -x /bin/funionfs ]; then
+$i			/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other -o suid,dev NONE /usr
+$i		else
+$i			/bin/mount -t aufs -o br:/.usr.ro:/.usr.rw none /usr
+$i		fi
 $i	fi
 $i fi
 $i
@@ -130,12 +134,14 @@
 post_install()
 {
     set_patch "$1"
-    if [ ! -x $1/bin/funionfs ]; then
+    if [ ! -x $1/bin/funionfs -a ! -d $1/var/lib/tazpkg/installed/aufs ]; then
         cat <<EOF
 ----
 You will build a live CD with /usr mounted read-only.
-You can install funionfs to have read-write access into /usr with:
+You can install aufs or funionfs to have read-write access into /usr with:
 
+# tazpkg get-install aufs
+or
 # tazpkg get-install funionfs
 
 EOF
diff -r dad369eb3126 -r f0963019ca5a slitaz-loram-cdrom/stuff/loram.rootfs
--- a/slitaz-loram-cdrom/stuff/loram.rootfs	Wed Dec 17 14:47:20 2008 +0000
+++ b/slitaz-loram-cdrom/stuff/loram.rootfs	Wed Dec 17 15:09:01 2008 +0000
@@ -27,10 +27,12 @@
 done
 echo "$(du -hs ./usr/.moved | cut -f1) have been moved into /usr"
 usr=usr
-if [ -x bin/funionfs -o -x usr/bin/mkcromfs ]; then
+if [ -x bin/funionfs -o -d /var/lib/tazpkg/installed/aufs ]; then
   usr=.usr.ro
   mkdir .usr.ro .usr.rw
-  ln -s /.usr.ro/lib/$(cd usr/lib ; ls libfuse.so.2.*) lib/libfuse.so.2
+fi
+if [ -x bin/funionfs -o -x usr/bin/mkcromfs ]; then
+  ln -s /$usr/lib/$(cd usr/lib ; ls libfuse.so.2.*) lib/libfuse.so.2
 fi
 if [ -x usr/bin/mkcromfs ]; then
   usr/bin/mkcromfs -qq -f 262144 -b 16384 usr ../rootcd/usr.cromfs
diff -r dad369eb3126 -r f0963019ca5a slitaz-loram/receipt
--- a/slitaz-loram/receipt	Wed Dec 17 14:47:20 2008 +0000
+++ b/slitaz-loram/receipt	Wed Dec 17 15:09:01 2008 +0000
@@ -25,11 +25,11 @@
     i=$(($i-1))
     tag=$(grep "$tag" $1/etc/init.d/rcS)
     if [ "$2" = "-R" ]; then
-    	line="-$(($i-21)),23 +$(($i-21)),2"
+    	line="-$(($i-25)),27 +$(($i-25)),2"
 	i="-"
     else
         grep -q 'from slitaz-loram package' $1/etc/init.d/rcS && return
-    	line="-$i,2 +$i,23"
+    	line="-$i,2 +$i,27"
 	i="+"
     fi
     patch -p0 <<EOF
@@ -48,12 +48,16 @@
 $i		echo -n "only... "
 $i	fi
 $i	if [ -f /.usr.cromfs ]; then
-$i		/bin/cromfs-driver \$FS /\$usr -o ro,dev,suid,allow_other
+$i		/bin/cromfs-driver /.usr.cromfs /\$usr -o ro,dev,suid,allow_other
 $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 -o suid,dev NONE /usr
+$i		if [ -x bin/funionfs ]; then
+$i			/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other -o suid,dev NONE /usr
+$i		else
+$i			/bin/mount -t aufs -o br:/.usr.ro:/.usr.rw none /usr
+$i		fi
 $i	fi
 $i	status
 $i fi
@@ -78,12 +82,14 @@
 post_install()
 {
     set_patch "$1"
-    if [ ! -x $1/bin/funionfs ]; then
+    if [ ! -x $1/bin/funionfs -a ! -d $1/var/lib/tazpkg/installed/aufs ]; then
         cat <<EOF
 ----
 You will build a live CD with /usr mounted read-only.
-You can install funionfs to have read-write access into /usr with:
+You can install aufs or funionfs to have read-write access into /usr with:
 
+# tazpkg get-install aufs
+or
 # tazpkg get-install funionfs
 
 EOF
diff -r dad369eb3126 -r f0963019ca5a slitaz-loram/stuff/loram.rootfs
--- a/slitaz-loram/stuff/loram.rootfs	Wed Dec 17 14:47:20 2008 +0000
+++ b/slitaz-loram/stuff/loram.rootfs	Wed Dec 17 15:09:01 2008 +0000
@@ -22,15 +22,18 @@
 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=usr
 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 -o -d /var/lib/tazpkg/installed/aufs ]; then
+  mkdir .usr.rw .usr.ro
+  usr=.usr.ro
+fi
 if [ -x bin/funionfs -o -x usr/bin/mkcromfs ]; then
-  mkdir .usr.ro
-  ln -s /.usr.ro/lib/$(cd usr/lib ; ls libfuse.so.2.*) lib/libfuse.so.2
-  [ -x bin/funionfs ] && mkdir .usr.rw
+  ln -s /$usr/lib/$(cd usr/lib ; ls libfuse.so.2.*) lib/libfuse.so.2
 fi
 rm -rf usr
 mkdir usr