wok-4.x rev 1339

slitaz-loram*: fix mount options for funionfs and cromfs
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Aug 31 16:20:22 2008 +0000 (2008-08-31)
parents fbccc97d8c2f
children 6a3b6976071a
files slitaz-loram-cdrom/receipt slitaz-loram-http/receipt slitaz-loram/receipt
line diff
     1.1 --- a/slitaz-loram-cdrom/receipt	Sun Aug 31 12:20:54 2008 +0000
     1.2 +++ b/slitaz-loram-cdrom/receipt	Sun Aug 31 16:20:22 2008 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="slitaz-loram-cdrom"
     1.7 -VERSION="1.3"
     1.8 +VERSION="1.4"
     1.9  CATEGORY="misc"
    1.10  SHORT_DESC="Rules to build low ram system using cdrom."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -64,7 +64,7 @@
    1.13  $i	FS=/cdrom/usr.cromfs
    1.14  $i	if [ -f \$FS ]; then
    1.15  $i		release_cdrom
    1.16 -$i		/bin/cromfs-driver \$FS /\$usr
    1.17 +$i		/bin/cromfs-driver \$FS /\$usr -o ro,dev,suid,allow_other
    1.18  $i	elif [ -f /cdrom/usr.sqfs ]; then
    1.19  $i		FS=/cdrom/usr.sqfs
    1.20  $i		release_cdrom
    1.21 @@ -81,7 +81,7 @@
    1.22  $i	fi
    1.23  $i	status 
    1.24  $i	if [ -d /.usr.rw -a -x /bin/funionfs ]; then
    1.25 -$i		/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other NONE /usr
    1.26 +$i		/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other -o suid,dev NONE /usr
    1.27  $i	fi
    1.28  $i fi
    1.29  $i
    1.30 @@ -130,7 +130,7 @@
    1.31  post_install()
    1.32  {
    1.33      set_patch "$1"
    1.34 -    if [ ! -x /bin/funionfs ]; then
    1.35 +    if [ ! -x $1/bin/funionfs ]; then
    1.36          cat <<EOF
    1.37  ----
    1.38  You will build a live CD with /usr mounted read-only.
     2.1 --- a/slitaz-loram-http/receipt	Sun Aug 31 12:20:54 2008 +0000
     2.2 +++ b/slitaz-loram-http/receipt	Sun Aug 31 16:20:22 2008 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="slitaz-loram-http"
     2.7 -VERSION="1.0"
     2.8 +VERSION="1.1"
     2.9  CATEGORY="misc"
    2.10  SHORT_DESC="Rules to build low ram system using http."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12 @@ -71,7 +71,7 @@
    2.13  $i	if [ -f \$FS ]; then
    2.14  $i		release_http
    2.15  $i		mkdir /\$usr
    2.16 -$i		/bin/cromfs-driver \$FS /\$usr
    2.17 +$i		/bin/cromfs-driver \$FS /\$usr -o ro,dev,suid,allow_other
    2.18  $i	elif [ -f /cdrom/usr.sqfs ]; then
    2.19  $i		FS=/cdrom/usr.sqfs
    2.20  $i		release_http
    2.21 @@ -83,7 +83,7 @@
    2.22  $i	fi
    2.23  $i	status 
    2.24  $i	if [ -d /.usr.rw -a -x /bin/funionfs ]; then
    2.25 -$i		/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other,nonempty NONE /usr
    2.26 +$i		/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other,nonempty -o suid,dev NONE /usr
    2.27  $i	fi
    2.28  $i fi
    2.29  $i
     3.1 --- a/slitaz-loram/receipt	Sun Aug 31 12:20:54 2008 +0000
     3.2 +++ b/slitaz-loram/receipt	Sun Aug 31 16:20:22 2008 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="slitaz-loram"
     3.7 -VERSION="1.3"
     3.8 +VERSION="1.4"
     3.9  CATEGORY="misc"
    3.10  SHORT_DESC="Rules to build low ram rootfs.gz."
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
    3.12 @@ -48,12 +48,12 @@
    3.13  $i		echo -n "only... "
    3.14  $i	fi
    3.15  $i	if [ -f /.usr.cromfs ]; then
    3.16 -$i		/bin/cromfs-driver /.usr.cromfs /\$usr
    3.17 +$i		/bin/cromfs-driver \$FS /\$usr -o ro,dev,suid,allow_other
    3.18  $i	else
    3.19  $i		/bin/mount -o loop,ro -t squashfs /.usr.sqfs /\$usr
    3.20  $i	fi
    3.21  $i	if [ -d /.usr.rw ]; then
    3.22 -$i		/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other NONE /usr
    3.23 +$i		/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other -o suid,dev NONE /usr
    3.24  $i	fi
    3.25  $i	status
    3.26  $i fi
    3.27 @@ -78,7 +78,7 @@
    3.28  post_install()
    3.29  {
    3.30      set_patch "$1"
    3.31 -    if [ ! -x /bin/funionfs ]; then
    3.32 +    if [ ! -x $1/bin/funionfs ]; then
    3.33          cat <<EOF
    3.34  ----
    3.35  You will build a live CD with /usr mounted read-only.