SliTaz Repositories

     1.1 --- a/slitaz-loram-cdrom/receipt	Tue Aug 18 09:06:36 2009 +0000
     1.2 +++ b/slitaz-loram-cdrom/receipt	Tue Aug 18 17:27:51 2009 +0200
     1.3 @@ -25,11 +25,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-60)),62 +$(($i-60)),2"
     1.8 +    	line="-$(($i-61)),63 +$(($i-61)),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,62"
    1.13 +    	line="-$i,2 +$i,63"
    1.14  	i="+"
    1.15      fi
    1.16      patch -p0 <<EOF
    1.17 @@ -61,38 +61,39 @@
    1.18  $i		DEVICE=\${DIR%,*}
    1.19  $i		DIR=/\${DIR#*,}
    1.20  $i	fi
    1.21 -$i	mount -o ro \$DEVICE /cdrom
    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 -$i		echo -n "Mounting /usr read-only... "
    1.27 -$i		usr=usr
    1.28 -$i	fi
    1.29 -$i	FS=/cdrom\$DIR/usr.cromfs
    1.30 -$i	if [ -f \$FS ]; then
    1.31 -$i		release_cdrom
    1.32 -$i		/bin/cromfs-driver \$FS /\$usr -o ro,dev,suid,allow_other
    1.33 -$i	elif [ -f /cdrom\$DIR/usr.sqfs ]; then
    1.34 -$i		FS=/cdrom\$DIR/usr.sqfs
    1.35 -$i		release_cdrom
    1.36 -$i		mount -o loop,ro -t squashfs \$FS /\$usr
    1.37 -$i	elif [ -L /\$usr ]; then
    1.38 -$i		FS=/cdrom\$DIR/usr
    1.39 -$i		if release_cdrom; then
    1.40 -$i			rm -f /\$usr
    1.41 -$i			mv \$FS /usr
    1.42 +$i	if mount -o ro \$DEVICE /cdrom 2> /dev/null ; then
    1.43 +$i		if [ -d /.usr.rw ]; then
    1.44 +$i			echo -n "Mounting /usr read-write... "
    1.45 +$i			usr=.usr.ro
    1.46 +$i		else
    1.47 +$i			echo -n "Mounting /usr read-only... "
    1.48 +$i			usr=usr
    1.49  $i		fi
    1.50 -$i	else
    1.51 -$i		umount /cdrom
    1.52 -$i		false
    1.53 -$i	fi
    1.54 -$i	status 
    1.55 -$i	if [ -d /.usr.rw ]; then
    1.56 -$i		if [ -x /bin/funionfs ]; then
    1.57 -$i			/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other -o suid,dev NONE /usr
    1.58 +$i		FS=/cdrom\$DIR/usr.cromfs
    1.59 +$i		if [ -f \$FS ]; then
    1.60 +$i			release_cdrom
    1.61 +$i			/bin/cromfs-driver \$FS /\$usr -o ro,dev,suid,allow_other
    1.62 +$i		elif [ -f /cdrom\$DIR/usr.sqfs ]; then
    1.63 +$i			FS=/cdrom\$DIR/usr.sqfs
    1.64 +$i			release_cdrom
    1.65 +$i			mount -o loop,ro -t squashfs \$FS /\$usr
    1.66 +$i		elif [ -L /\$usr ]; then
    1.67 +$i			FS=/cdrom\$DIR/usr
    1.68 +$i			if release_cdrom; then
    1.69 +$i				rm -f /\$usr
    1.70 +$i				mv \$FS /usr
    1.71 +$i			fi
    1.72  $i		else
    1.73 -$i			/bin/mount -t aufs -o br:/.usr.rw:/.usr.ro none /usr
    1.74 +$i			umount /cdrom
    1.75 +$i			false
    1.76 +$i		fi
    1.77 +$i		status 
    1.78 +$i		if [ -d /.usr.rw ]; then
    1.79 +$i			if [ -x /bin/funionfs ]; then
    1.80 +$i				/bin/funionfs -o dirs=/.usr.ro=RO:/.usr.rw -o allow_other -o suid,dev NONE /usr
    1.81 +$i			else
    1.82 +$i				/bin/mount -t aufs -o br:/.usr.rw:/.usr.ro none /usr
    1.83 +$i			fi
    1.84  $i		fi
    1.85  $i	fi
    1.86  $i fi

     2.1 --- a/slitaz-loram-cdrom/stuff/loram.rootfs	Tue Aug 18 09:06:36 2009 +0000
     2.2 +++ b/slitaz-loram-cdrom/stuff/loram.rootfs	Tue Aug 18 17:27:51 2009 +0200
     2.3 @@ -22,6 +22,7 @@
     2.4    [ -L .$ii ] && continue
     2.5    case "$ii" in
     2.6    /lib/libnss_file*) continue;;
     2.7 +  /lib/libpthread*)  continue;;
     2.8    esac
     2.9    j=$(dirname /usr/.moved$ii)
    2.10    mkdir -p .$j