wok diff busybox/receipt @ rev 5975

busybox*: remember post_install answer
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Aug 11 12:39:49 2010 +0200 (2010-08-11)
parents c29991cef110
children 029092db0791
line diff
     1.1 --- a/busybox/receipt	Wed Jul 28 14:15:27 2010 +0200
     1.2 +++ b/busybox/receipt	Wed Aug 11 12:39:49 2010 +0200
     1.3 @@ -67,13 +67,16 @@
     1.4      mkdir -p $fs/etc/modprobe.d
     1.5      # Udhcpc stuff.
     1.6      mkdir -p $fs/usr/share/udhcpc
     1.7 -    cp stuff/udhcp.script  $fs/usr/share/udhcpc/default.script
     1.8 +    cp stuff/udhcp.script $fs/usr/share/udhcpc/default.script
     1.9      chmod +x $fs/usr/share/udhcpc/default.script
    1.10      # ZeroConf stuff.
    1.11      cp stuff/zcip.script $fs/etc
    1.12      # Httpd stuff.
    1.13      cp stuff/httpd_helper.sh $fs/usr/bin
    1.14      chmod +x $fs/usr/bin/httpd_helper.sh
    1.15 +    # .desktop stuff
    1.16 +    mkdir -p $fs/usr/share
    1.17 +    cp -a stuff/applications $fs/usr/share
    1.18  }
    1.19  
    1.20  # Force glibc-2.7 reinstall if 2.3.6 still in use.
    1.21 @@ -97,7 +100,7 @@
    1.22  			read -t 30 answer	# by default: keep
    1.23  			case "$answer" in
    1.24  			n*|N*) break;;
    1.25 -			*) ;;
    1.26 +			*) answer="Y";;
    1.27  			esac
    1.28  		fi
    1.29  		cp -a $1$i $1$i-busybox-install
    1.30 @@ -114,4 +117,5 @@
    1.31  		mv $1$i-busybox-install $1$i
    1.32  	done < $1$INSTALLED/$PACKAGE/files.list
    1.33  	chmod 4755 $1/bin/busybox
    1.34 +	sed -i "s@vcsa2txt.*\$@busybox conspy -d | sed 's/ *\$//;/^\$/d;/^Processi\|^.witchi/,\$!d' > /var/log/boot.log@" $1/etc/init.d/rcS
    1.35  }