wok-6.x diff busybox-pam/receipt @ rev 5053

fix typos: libgphoto2
author Rohit Joshi <jozee@slitaz.org>
date Sat Mar 06 18:51:17 2010 +0000 (2010-03-06)
parents 02779417eb2b
children 2a5e098a34ac
line diff
     1.1 --- a/busybox-pam/receipt	Mon Feb 22 16:29:36 2010 +0100
     1.2 +++ b/busybox-pam/receipt	Sat Mar 06 18:51:17 2010 +0000
     1.3 @@ -94,13 +94,32 @@
     1.4  # Force glibc-2.7 reinstall if 2.3.6 still in use.
     1.5  pre_install()
     1.6  {
     1.7 +	local i
     1.8  	cp -a /etc/resolv.conf /etc/resolv.conf-busybox-install
     1.9  	if grep -q 'VERSION="2.3.6"' /var/lib/tazpkg/installed/glibc-base/receipt; then
    1.10  		tazpkg get-install glibc-base --forced
    1.11  	fi
    1.12 +	answer=""
    1.13 +	while read i ; do
    1.14 +		[ -e $ROOT$i ] || continue
    1.15 +		if [ -z "$answer" ]; then
    1.16 +			echo -n "Keep installed GNU utilities ? "
    1.17 +			read answer
    1.18 +			case "$answer" in
    1.19 +			y*|Y*|o*|O*);;
    1.20 +			*) break;;
    1.21 +			esac
    1.22 +		fi
    1.23 +		mv $ROOT$i $ROOT$i-busybox-install
    1.24 +	done < $1$INSTALLED/$PACKAGE/files.list
    1.25  }
    1.26  
    1.27  post_install()
    1.28  {
    1.29 +	local i
    1.30  	mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf
    1.31 +	while read i ; do
    1.32 +		[ -e $ROOT$i-busybox-install ] || continue
    1.33 +		mv $ROOT$i-busybox-install $ROOT$i
    1.34 +	done < $1$INSTALLED/$PACKAGE/files.list
    1.35  }