wok diff slitaz-loram-http/receipt @ rev 11566
Add shaarli form wok-undigest
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Dec 25 15:19:26 2011 +0100 (2011-12-25) |
parents | fa0257184d3c |
children | a40a0eb643ba |
line diff
1.1 --- a/slitaz-loram-http/receipt Fri Mar 05 17:52:43 2010 +0100 1.2 +++ b/slitaz-loram-http/receipt Sun Dec 25 15:19:26 2011 +0100 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="slitaz-loram-http" 1.7 -VERSION="1.5" 1.8 +VERSION="1.6" 1.9 CATEGORY="misc" 1.10 SHORT_DESC="Rules to build low ram system using http." 1.11 MAINTAINER="pascal.bellard@slitaz.org" 1.12 @@ -24,7 +24,7 @@ 1.13 tag="Handle kernel cmdline parameter config" 1.14 i=$(grep -n "$tag" $1/etc/init.d/rcS | cut -d: -f1) 1.15 i=$(($i-1)) 1.16 - len=72 1.17 + len=89 1.18 tag=$(grep "$tag" $1/etc/init.d/rcS) 1.19 if [ "$2" = "-R" ]; then 1.20 line="-$(($i-$len+2)),$len +$(($i-$len+2)),2" 1.21 @@ -75,7 +75,10 @@ 1.22 $i while [ -d /cdrom ]; do 1.23 $i /etc/init.d/network.sh 1.24 $i RUN_SCRIPTS="\$(echo \$RUN_SCRIPTS | sed 's/network.sh//')" 1.25 -$i URLISO=http://mirror.slitaz.org/iso/\$(cat /etc/slitaz-release)/flavors/slitaz-loram-cdrom.iso,http://download.tuxfamily.org/slitaz/iso/\$(cat /etc/slitaz-release)/flavors/slitaz-loram-cdrom.iso,http://slitaz.c3sl.ufpr.br/iso/\$(cat /etc/slitaz-release)/flavors/slitaz-loram-cdrom.iso 1.26 +$i release=\$(cat /etc/slitaz-release) 1.27 +$i iso1=iso/\$release/flavors/slitaz-\$release-loram-cdrom.iso 1.28 +$i iso2=iso/\$release/flavors/slitaz-loram-cdrom.iso 1.29 +$i URLISO=http://mirror.slitaz.org/\$iso1,http://mirror.slitaz.org/\$iso2,http://download.tuxfamily.org/slitaz/\$iso1,http://download.tuxfamily.org/slitaz/\$iso2,http://slitaz.c3sl.ufpr.br/\$iso1,http://slitaz.c3sl.ufpr.br/\$iso2 1.30 $i grep -q " urliso=" /proc/cmdline && URLISO=\$(cat /proc/cmdline | sed 's/.* urliso=\([^ ]*\).*/\1/'),\$URLISO 1.31 $i for i in \$(echo \$URLISO | sed 's/,/ /g'); do 1.32 $i /bin/httpfs \$i /cdrom && break 1.33 @@ -91,16 +94,30 @@ 1.34 $i FS=/cdrom/usr.cromfs 1.35 $i if [ -f \$FS ]; then 1.36 $i mkdir /\$usr 1.37 +$i ln -s /usr/.moved /.moved 1.38 $i release_http && break 1.39 $i /bin/cromfs-driver \$FS /\$usr -o ro,dev,suid,allow_other 1.40 -$i elif [ -f /cdrom/usr.sqfs ]; then 1.41 +$i elif grep -q squashfs /etc/filesystems && [ -f /cdrom/usr.sqfs ]; then 1.42 $i FS=/cdrom/usr.sqfs 1.43 +$i ln -s /usr/.moved /.moved 1.44 $i mkdir /\$usr 1.45 $i release_http && break 1.46 $i mount -o loop,ro -t squashfs \$FS /\$usr 1.47 +$i elif grep -q squashfs /etc/filesystems && [ -f /cdrom/rootfs.gz ]; then 1.48 +$i FS=/cdrom/rootfs.gz 1.49 +$i ln -s /.rootfs /.moved 1.50 +$i mkdir /.rootfs 1.51 +$i release_http && break 1.52 +$i mount -o loop,ro -t squashfs \$FS /.rootfs 1.53 +$i ln -s /.rootfs/usr /\$usr 1.54 +$i elif [ -d /cdrom/usr ]; then 1.55 +$i FS=/cdrom/usr 1.56 +$i ln -s /usr/.moved /.moved 1.57 +$i rm -rf /\$usr && ln -s \$FS /\$usr 1.58 $i else 1.59 -$i FS=/cdrom/usr 1.60 -$i ln -s \$FS /\$usr 1.61 +$i FS=/cdrom/fs/usr 1.62 +$i ln -s /cdrom/fs /.moved 1.63 +$i rm -rf /\$usr && ln -s \$FS /\$usr 1.64 $i fi 1.65 $i status 1.66 $i if [ -d /.usr.rw -a -x /bin/funionfs ]; then