# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1220199622 0
# Node ID 3f49dc9f3e80b8a6bac6668a21760d9bef408161
# Parent  fbccc97d8c2f1c6fa3340cc18565a974ca10757a
slitaz-loram*: fix mount options for funionfs and cromfs

diff -r fbccc97d8c2f -r 3f49dc9f3e80 slitaz-loram-cdrom/receipt
--- a/slitaz-loram-cdrom/receipt	Sun Aug 31 12:20:54 2008 +0000
+++ b/slitaz-loram-cdrom/receipt	Sun Aug 31 16:20:22 2008 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-loram-cdrom"
-VERSION="1.3"
+VERSION="1.4"
 CATEGORY="misc"
 SHORT_DESC="Rules to build low ram system using cdrom."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -64,7 +64,7 @@
 $i	FS=/cdrom/usr.cromfs
 $i	if [ -f \$FS ]; then
 $i		release_cdrom
-$i		/bin/cromfs-driver \$FS /\$usr
+$i		/bin/cromfs-driver \$FS /\$usr -o ro,dev,suid,allow_other
 $i	elif [ -f /cdrom/usr.sqfs ]; then
 $i		FS=/cdrom/usr.sqfs
 $i		release_cdrom
@@ -81,7 +81,7 @@
 $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 NONE /usr
+$i		/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other -o suid,dev NONE /usr
 $i	fi
 $i fi
 $i
@@ -130,7 +130,7 @@
 post_install()
 {
     set_patch "$1"
-    if [ ! -x /bin/funionfs ]; then
+    if [ ! -x $1/bin/funionfs ]; then
         cat <<EOF
 ----
 You will build a live CD with /usr mounted read-only.
diff -r fbccc97d8c2f -r 3f49dc9f3e80 slitaz-loram-http/receipt
--- a/slitaz-loram-http/receipt	Sun Aug 31 12:20:54 2008 +0000
+++ b/slitaz-loram-http/receipt	Sun Aug 31 16:20:22 2008 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-loram-http"
-VERSION="1.0"
+VERSION="1.1"
 CATEGORY="misc"
 SHORT_DESC="Rules to build low ram system using http."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -71,7 +71,7 @@
 $i	if [ -f \$FS ]; then
 $i		release_http
 $i		mkdir /\$usr
-$i		/bin/cromfs-driver \$FS /\$usr
+$i		/bin/cromfs-driver \$FS /\$usr -o ro,dev,suid,allow_other
 $i	elif [ -f /cdrom/usr.sqfs ]; then
 $i		FS=/cdrom/usr.sqfs
 $i		release_http
@@ -83,7 +83,7 @@
 $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,nonempty NONE /usr
+$i		/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other,nonempty -o suid,dev NONE /usr
 $i	fi
 $i fi
 $i
diff -r fbccc97d8c2f -r 3f49dc9f3e80 slitaz-loram/receipt
--- a/slitaz-loram/receipt	Sun Aug 31 12:20:54 2008 +0000
+++ b/slitaz-loram/receipt	Sun Aug 31 16:20:22 2008 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-loram"
-VERSION="1.3"
+VERSION="1.4"
 CATEGORY="misc"
 SHORT_DESC="Rules to build low ram rootfs.gz."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -48,12 +48,12 @@
 $i		echo -n "only... "
 $i	fi
 $i	if [ -f /.usr.cromfs ]; then
-$i		/bin/cromfs-driver /.usr.cromfs /\$usr
+$i		/bin/cromfs-driver \$FS /\$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 NONE /usr
+$i		/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other -o suid,dev NONE /usr
 $i	fi
 $i	status
 $i fi
@@ -78,7 +78,7 @@
 post_install()
 {
     set_patch "$1"
-    if [ ! -x /bin/funionfs ]; then
+    if [ ! -x $1/bin/funionfs ]; then
         cat <<EOF
 ----
 You will build a live CD with /usr mounted read-only.