SliTaz Repositories

     1.1 --- a/slitaz-loram-cdrom/receipt	Sun Aug 31 16:20:22 2008 +0000
     1.2 +++ b/slitaz-loram-cdrom/receipt	Wed Dec 17 15:09:01 2008 +0000
     1.3 @@ -24,11 +24,11 @@
     1.4      i=$(($i-1))
     1.5      tag=$(grep "$tag" $1/etc/init.d/rcS)
     1.6      if [ "$2" = "-R" ]; then
     1.7 -    	line="-$(($i-49)),51 +$(($i-49)),2"
     1.8 +    	line="-$(($i-53)),55 +$(($i-53)),2"
     1.9  	i="-"
    1.10      else
    1.11          grep -q 'from slitaz-loram-cdrom package' $1/etc/init.d/rcS && return
    1.12 -    	line="-$i,2 +$i,51"
    1.13 +    	line="-$i,2 +$i,55"
    1.14  	i="+"
    1.15      fi
    1.16      patch -p0 <<EOF
    1.17 @@ -54,7 +54,7 @@
    1.18  $i# Mount /usr (from slitaz-loram-cdrom package)
    1.19  $i if [ -d /cdrom ]; then
    1.20  $i	mount -o ro -t iso9660 /dev/cdrom /cdrom
    1.21 -$i	if [ -d /.usr.rw -a -x /bin/funionfs ]; then
    1.22 +$i	if [ -d /.usr.rw ]; then
    1.23  $i		echo -n "Mounting /usr read-write... "
    1.24  $i		usr=.usr.ro
    1.25  $i	else
    1.26 @@ -80,8 +80,12 @@
    1.27  $i		false
    1.28  $i	fi
    1.29  $i	status 
    1.30 -$i	if [ -d /.usr.rw -a -x /bin/funionfs ]; then
    1.31 -$i		/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other -o suid,dev NONE /usr
    1.32 +$i	if [ -d /.usr.rw ]; then
    1.33 +$i		if [ -x /bin/funionfs ]; then
    1.34 +$i			/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other -o suid,dev NONE /usr
    1.35 +$i		else
    1.36 +$i			/bin/mount -t aufs -o br:/.usr.ro:/.usr.rw none /usr
    1.37 +$i		fi
    1.38  $i	fi
    1.39  $i fi
    1.40  $i
    1.41 @@ -130,12 +134,14 @@
    1.42  post_install()
    1.43  {
    1.44      set_patch "$1"
    1.45 -    if [ ! -x $1/bin/funionfs ]; then
    1.46 +    if [ ! -x $1/bin/funionfs -a ! -d $1/var/lib/tazpkg/installed/aufs ]; then
    1.47          cat <<EOF
    1.48  ----
    1.49  You will build a live CD with /usr mounted read-only.
    1.50 -You can install funionfs to have read-write access into /usr with:
    1.51 +You can install aufs or funionfs to have read-write access into /usr with:
    1.52  
    1.53 +# tazpkg get-install aufs
    1.54 +or
    1.55  # tazpkg get-install funionfs
    1.56  
    1.57  EOF