wok-next rev 4454
loram*: /etc/init.d/rcS needs find & xargs
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Nov 08 12:55:54 2009 +0100 (2009-11-08) |
parents | d03ee64f3d3a |
children | 088867d7c05d |
files | slitaz-loram-cdrom/receipt slitaz-loram-cdrom/stuff/loram.extract slitaz-loram-cdrom/stuff/loram.rootfs slitaz-loram-http/receipt slitaz-loram-http/stuff/loram.extract slitaz-loram-http/stuff/loram.rootfs slitaz-loram/receipt slitaz-loram/stuff/loram.extract slitaz-loram/stuff/loram.rootfs |
line diff
1.1 --- a/slitaz-loram-cdrom/receipt Sun Nov 08 11:20:28 2009 +0000 1.2 +++ b/slitaz-loram-cdrom/receipt Sun Nov 08 12:55:54 2009 +0100 1.3 @@ -42,11 +42,11 @@ 1.4 $i# Try to release the cdrom (from slitaz-loram-cdrom package) 1.5 $i release_cdrom() 1.6 $i { 1.7 -$i FREEMEM=\$(busybox free | busybox awk '{ n = \$NF } END { print n }') 1.8 -$i if [ \$FREEMEM -gt \$(busybox du -s \$FS | busybox awk '{ print \$1+40000 }') ]; then 1.9 +$i FREEMEM=\$(free | awk '{ n = \$NF } END { print n }') 1.10 +$i if [ \$FREEMEM -gt \$(du -s \$FS | awk '{ print \$1+40000 }') ]; then 1.11 $i if grep -q " extract-loram" /proc/cmdline && 1.12 -$i [ -d \$FS -o \$FREEMEM -gt \$(busybox du -s \$FS | \\ 1.13 -$i busybox awk '{ print (\$1*4)+40000 }') ]; then 1.14 +$i [ -d \$FS -o \$FREEMEM -gt \$(du -s \$FS | \\ 1.15 +$i awk '{ print (\$1*4)+40000 }') ]; then 1.16 $i echo -n "Extracting loram..." 1.17 $i . /etc/tazlito/loram.extract /cdrom 1.18 $i if status; then
2.1 --- a/slitaz-loram-cdrom/stuff/loram.extract Sun Nov 08 11:20:28 2009 +0000 2.2 +++ b/slitaz-loram-cdrom/stuff/loram.extract Sun Nov 08 12:55:54 2009 +0100 2.3 @@ -45,6 +45,6 @@ 2.4 sed -i 's/RUN_DAEMONS="/RUN_DAEMONS="slim /' etc/rcS.conf 2.5 fi 2.6 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ 2.7 - bin/killall5 bin/seq ; do 2.8 + bin/killall5 bin/seq bin/find bin/xargs bin/patch; do 2.9 [ -e usr/$ii ] && rm -f $ii 2.10 done
3.1 --- a/slitaz-loram-cdrom/stuff/loram.rootfs Sun Nov 08 11:20:28 2009 +0000 3.2 +++ b/slitaz-loram-cdrom/stuff/loram.rootfs Sun Nov 08 12:55:54 2009 +0100 3.3 @@ -98,7 +98,7 @@ 3.4 EOT 3.5 fi 3.6 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ 3.7 - bin/killall5 bin/seq ; do 3.8 + bin/killall5 bin/seq bin/find bin/xargs bin/patch; do 3.9 [ -e $ii ] || ln -s busybox $ii 3.10 done 3.11 mkdir cdrom
4.1 --- a/slitaz-loram-http/receipt Sun Nov 08 11:20:28 2009 +0000 4.2 +++ b/slitaz-loram-http/receipt Sun Nov 08 12:55:54 2009 +0100 4.3 @@ -42,12 +42,12 @@ 4.4 $i# Try to release http link (from slitaz-loram-http package) 4.5 $i release_http() 4.6 $i { 4.7 -$i FREEMEM=\$(busybox free | busybox awk '{ n = \$NF } END { print n }') 4.8 -$i if [ \$FREEMEM -gt \$(busybox du -s \$FS | busybox awk '{ print \$1+40000 }') ]; then 4.9 +$i FREEMEM=\$(free | awk '{ n = \$NF } END { print n }') 4.10 +$i if [ \$FREEMEM -gt \$(du -s \$FS | awk '{ print \$1+40000 }') ]; then 4.11 $i status 4.12 $i if grep -q " extract-loram" /proc/cmdline && 4.13 -$i [ -d \$FS -o \$FREEMEM -gt \$(busybox du -s \$FS | \\ 4.14 -$i busybox awk '{ print (\$1*4)+40000 }') ]; then 4.15 +$i [ -d \$FS -o \$FREEMEM -gt \$(du -s \$FS | \\ 4.16 +$i awk '{ print (\$1*4)+40000 }') ]; then 4.17 $i echo -n "Extracting loram..." 4.18 $i . /etc/tazlito/loram.extract /cdrom 4.19 $i if status; then
5.1 --- a/slitaz-loram-http/stuff/loram.extract Sun Nov 08 11:20:28 2009 +0000 5.2 +++ b/slitaz-loram-http/stuff/loram.extract Sun Nov 08 12:55:54 2009 +0100 5.3 @@ -45,6 +45,6 @@ 5.4 sed -i 's/RUN_DAEMONS="/RUN_DAEMONS="slim /' etc/rcS.conf 5.5 fi 5.6 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ 5.7 - bin/killall5 bin/seq ; do 5.8 + bin/killall5 bin/seq bin/find bin/xargs bin/patch; do 5.9 [ -e usr/$ii ] && rm -f $ii 5.10 done
6.1 --- a/slitaz-loram-http/stuff/loram.rootfs Sun Nov 08 11:20:28 2009 +0000 6.2 +++ b/slitaz-loram-http/stuff/loram.rootfs Sun Nov 08 12:55:54 2009 +0100 6.3 @@ -34,7 +34,7 @@ 6.4 mv default.script usr/share/udhcpc 6.5 ln -s /cdrom/boot boot 6.6 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ 6.7 - bin/killall5 bin/seq ; do 6.8 + bin/killall5 bin/seq bin/find bin/xargs bin/patch; do 6.9 [ -e $ii ] || ln -s busybox $ii 6.10 done 6.11 mkdir cdrom .usr.rw
7.1 --- a/slitaz-loram/receipt Sun Nov 08 11:20:28 2009 +0000 7.2 +++ b/slitaz-loram/receipt Sun Nov 08 12:55:54 2009 +0100 7.3 @@ -49,9 +49,9 @@ 7.4 $i else 7.5 $i echo -n "only... " 7.6 $i fi 7.7 -$i FREEMEM=\$(busybox free | busybox awk '{ n = \$NF } END { print n }') 7.8 +$i FREEMEM=\$(free | awk '{ n = \$NF } END { print n }') 7.9 $i if grep -q " extract-loram" /proc/cmdline && [ \$FREEMEM -gt \\ 7.10 -$i \$(busybox du -s \$FS | busybox awk '{ print (\$1*4)+40000 }') ]; then 7.11 +$i \$(du -s \$FS | awk '{ print (\$1*4)+40000 }') ]; then 7.12 $i echo -n "Extracting loram..." 7.13 $i . /etc/tazlito/loram.extract 7.14 $i if status; then
8.1 --- a/slitaz-loram/stuff/loram.extract Sun Nov 08 11:20:28 2009 +0000 8.2 +++ b/slitaz-loram/stuff/loram.extract Sun Nov 08 12:55:54 2009 +0100 8.3 @@ -21,6 +21,6 @@ 8.4 [ -e $ii ] && mv $ii* usr/lib/ 8.5 done 8.6 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ 8.7 - bin/killall5 bin/seq ; do 8.8 + bin/killall5 bin/seq bin/find bin/xargs bin/patch; do 8.9 [ -e usr/$ii ] && rm -f $ii 8.10 done
9.1 --- a/slitaz-loram/stuff/loram.rootfs Sun Nov 08 11:20:28 2009 +0000 9.2 +++ b/slitaz-loram/stuff/loram.rootfs Sun Nov 08 12:55:54 2009 +0100 9.3 @@ -42,6 +42,6 @@ 9.4 COMPRESSION="gzip" 9.5 echo "$(du -hs ./.usr.*fs | cut -f1) are used by /usr after compression" 9.6 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ 9.7 - bin/killall5 bin/seq ; do 9.8 + bin/killall5 bin/seq bin/find bin/xargs bin/patch; do 9.9 [ -e $ii ] || ln -s busybox $ii 9.10 done