# HG changeset patch # User Pascal Bellard # Date 1257681354 -3600 # Node ID d9ddcc6d973cc5a6d1f9743870ced6381f86757f # Parent d03ee64f3d3a395eb49fd34016212e0dfcc1219c loram*: /etc/init.d/rcS needs find & xargs diff -r d03ee64f3d3a -r d9ddcc6d973c slitaz-loram-cdrom/receipt --- a/slitaz-loram-cdrom/receipt Sun Nov 08 11:20:28 2009 +0000 +++ b/slitaz-loram-cdrom/receipt Sun Nov 08 12:55:54 2009 +0100 @@ -42,11 +42,11 @@ $i# Try to release the cdrom (from slitaz-loram-cdrom package) $i release_cdrom() $i { -$i FREEMEM=\$(busybox free | busybox awk '{ n = \$NF } END { print n }') -$i if [ \$FREEMEM -gt \$(busybox du -s \$FS | busybox awk '{ print \$1+40000 }') ]; then +$i FREEMEM=\$(free | awk '{ n = \$NF } END { print n }') +$i if [ \$FREEMEM -gt \$(du -s \$FS | awk '{ print \$1+40000 }') ]; then $i if grep -q " extract-loram" /proc/cmdline && -$i [ -d \$FS -o \$FREEMEM -gt \$(busybox du -s \$FS | \\ -$i busybox awk '{ print (\$1*4)+40000 }') ]; then +$i [ -d \$FS -o \$FREEMEM -gt \$(du -s \$FS | \\ +$i awk '{ print (\$1*4)+40000 }') ]; then $i echo -n "Extracting loram..." $i . /etc/tazlito/loram.extract /cdrom $i if status; then diff -r d03ee64f3d3a -r d9ddcc6d973c slitaz-loram-cdrom/stuff/loram.extract --- a/slitaz-loram-cdrom/stuff/loram.extract Sun Nov 08 11:20:28 2009 +0000 +++ b/slitaz-loram-cdrom/stuff/loram.extract Sun Nov 08 12:55:54 2009 +0100 @@ -45,6 +45,6 @@ sed -i 's/RUN_DAEMONS="/RUN_DAEMONS="slim /' etc/rcS.conf fi for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ - bin/killall5 bin/seq ; do + bin/killall5 bin/seq bin/find bin/xargs bin/patch; do [ -e usr/$ii ] && rm -f $ii done diff -r d03ee64f3d3a -r d9ddcc6d973c slitaz-loram-cdrom/stuff/loram.rootfs --- a/slitaz-loram-cdrom/stuff/loram.rootfs Sun Nov 08 11:20:28 2009 +0000 +++ b/slitaz-loram-cdrom/stuff/loram.rootfs Sun Nov 08 12:55:54 2009 +0100 @@ -98,7 +98,7 @@ EOT fi for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ - bin/killall5 bin/seq ; do + bin/killall5 bin/seq bin/find bin/xargs bin/patch; do [ -e $ii ] || ln -s busybox $ii done mkdir cdrom diff -r d03ee64f3d3a -r d9ddcc6d973c slitaz-loram-http/receipt --- a/slitaz-loram-http/receipt Sun Nov 08 11:20:28 2009 +0000 +++ b/slitaz-loram-http/receipt Sun Nov 08 12:55:54 2009 +0100 @@ -42,12 +42,12 @@ $i# Try to release http link (from slitaz-loram-http package) $i release_http() $i { -$i FREEMEM=\$(busybox free | busybox awk '{ n = \$NF } END { print n }') -$i if [ \$FREEMEM -gt \$(busybox du -s \$FS | busybox awk '{ print \$1+40000 }') ]; then +$i FREEMEM=\$(free | awk '{ n = \$NF } END { print n }') +$i if [ \$FREEMEM -gt \$(du -s \$FS | awk '{ print \$1+40000 }') ]; then $i status $i if grep -q " extract-loram" /proc/cmdline && -$i [ -d \$FS -o \$FREEMEM -gt \$(busybox du -s \$FS | \\ -$i busybox awk '{ print (\$1*4)+40000 }') ]; then +$i [ -d \$FS -o \$FREEMEM -gt \$(du -s \$FS | \\ +$i awk '{ print (\$1*4)+40000 }') ]; then $i echo -n "Extracting loram..." $i . /etc/tazlito/loram.extract /cdrom $i if status; then diff -r d03ee64f3d3a -r d9ddcc6d973c slitaz-loram-http/stuff/loram.extract --- a/slitaz-loram-http/stuff/loram.extract Sun Nov 08 11:20:28 2009 +0000 +++ b/slitaz-loram-http/stuff/loram.extract Sun Nov 08 12:55:54 2009 +0100 @@ -45,6 +45,6 @@ sed -i 's/RUN_DAEMONS="/RUN_DAEMONS="slim /' etc/rcS.conf fi for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ - bin/killall5 bin/seq ; do + bin/killall5 bin/seq bin/find bin/xargs bin/patch; do [ -e usr/$ii ] && rm -f $ii done diff -r d03ee64f3d3a -r d9ddcc6d973c slitaz-loram-http/stuff/loram.rootfs --- a/slitaz-loram-http/stuff/loram.rootfs Sun Nov 08 11:20:28 2009 +0000 +++ b/slitaz-loram-http/stuff/loram.rootfs Sun Nov 08 12:55:54 2009 +0100 @@ -34,7 +34,7 @@ mv default.script usr/share/udhcpc ln -s /cdrom/boot boot for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ - bin/killall5 bin/seq ; do + bin/killall5 bin/seq bin/find bin/xargs bin/patch; do [ -e $ii ] || ln -s busybox $ii done mkdir cdrom .usr.rw diff -r d03ee64f3d3a -r d9ddcc6d973c slitaz-loram/receipt --- a/slitaz-loram/receipt Sun Nov 08 11:20:28 2009 +0000 +++ b/slitaz-loram/receipt Sun Nov 08 12:55:54 2009 +0100 @@ -49,9 +49,9 @@ $i else $i echo -n "only... " $i fi -$i FREEMEM=\$(busybox free | busybox awk '{ n = \$NF } END { print n }') +$i FREEMEM=\$(free | awk '{ n = \$NF } END { print n }') $i if grep -q " extract-loram" /proc/cmdline && [ \$FREEMEM -gt \\ -$i \$(busybox du -s \$FS | busybox awk '{ print (\$1*4)+40000 }') ]; then +$i \$(du -s \$FS | awk '{ print (\$1*4)+40000 }') ]; then $i echo -n "Extracting loram..." $i . /etc/tazlito/loram.extract $i if status; then diff -r d03ee64f3d3a -r d9ddcc6d973c slitaz-loram/stuff/loram.extract --- a/slitaz-loram/stuff/loram.extract Sun Nov 08 11:20:28 2009 +0000 +++ b/slitaz-loram/stuff/loram.extract Sun Nov 08 12:55:54 2009 +0100 @@ -21,6 +21,6 @@ [ -e $ii ] && mv $ii* usr/lib/ done for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ - bin/killall5 bin/seq ; do + bin/killall5 bin/seq bin/find bin/xargs bin/patch; do [ -e usr/$ii ] && rm -f $ii done diff -r d03ee64f3d3a -r d9ddcc6d973c slitaz-loram/stuff/loram.rootfs --- a/slitaz-loram/stuff/loram.rootfs Sun Nov 08 11:20:28 2009 +0000 +++ b/slitaz-loram/stuff/loram.rootfs Sun Nov 08 12:55:54 2009 +0100 @@ -42,6 +42,6 @@ COMPRESSION="gzip" echo "$(du -hs ./.usr.*fs | cut -f1) are used by /usr after compression" for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ - bin/killall5 bin/seq ; do + bin/killall5 bin/seq bin/find bin/xargs bin/patch; do [ -e $ii ] || ln -s busybox $ii done