# HG changeset patch # User Pascal Bellard # Date 1279550769 -7200 # Node ID f835c545f2b61c87d4c65e5962d3868ec8fee628 # Parent 1bc38e51b3d9791ba8d4b851fc56ff17e8c51bdc busybox: fix pre_install/post_install diff -r 1bc38e51b3d9 -r f835c545f2b6 busybox-pam/receipt --- a/busybox-pam/receipt Mon Jul 19 16:34:13 2010 +0200 +++ b/busybox-pam/receipt Mon Jul 19 16:46:09 2010 +0200 @@ -92,7 +92,7 @@ fi answer="" while read i ; do - [ -e $1$i ] || continue + [ -f $1$i ] || continue if [ -z "$answer" ]; then echo -n "Keep installed GNU utilities ? " read answer @@ -101,7 +101,7 @@ *) break;; esac fi - mv $1$i $1$i-busybox-install + cp -a $1$i $1$i-busybox-install done < $1$INSTALLED/$PACKAGE/files.list } @@ -110,7 +110,7 @@ local i mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf while read i ; do - [ -e $1$i-busybox-install ] || continue + [ -f $1$i-busybox-install ] || continue mv $1$i-busybox-install $1$i done < $1$INSTALLED/$PACKAGE/files.list chmod 4755 $1/bin/busybox diff -r 1bc38e51b3d9 -r f835c545f2b6 busybox/receipt --- a/busybox/receipt Mon Jul 19 16:34:13 2010 +0200 +++ b/busybox/receipt Mon Jul 19 16:46:09 2010 +0200 @@ -85,7 +85,7 @@ fi answer="" while read i ; do - [ -e $1$i ] || continue + [ -f $1$i ] || continue if [ -z "$answer" ]; then echo -n "Keep installed GNU utilities ? " read -t 30 answer # by default: keep @@ -94,7 +94,7 @@ *) ;; esac fi - mv $1$i $1$i-busybox-install + cp -a $1$i $1$i-busybox-install done < $1$INSTALLED/$PACKAGE/files.list } @@ -103,7 +103,7 @@ local i mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf while read i ; do - [ -e $1$i-busybox-install ] || continue + [ -f $1$i-busybox-install ] || continue mv $1$i-busybox-install $1$i done < $1$INSTALLED/$PACKAGE/files.list chmod 4755 $1/bin/busybox