# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1281523189 -7200
# Node ID 75dd5efa31059e71b94ee0c49d3c7aae0b68d35c
# Parent  7cc5d70d5d9bcf0edfdbfa52aae4233a6e76061b
busybox*: remember post_install answer

diff -r 7cc5d70d5d9b -r 75dd5efa3105 busybox-pam/receipt
--- a/busybox-pam/receipt	Mon Aug 09 09:37:59 2010 +0200
+++ b/busybox-pam/receipt	Wed Aug 11 12:39:49 2010 +0200
@@ -35,6 +35,7 @@
 EOT
     cp $WOK/$SOURCE/stuff/$SOURCE-$VERSION.config .config
     sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config
+    make oldconfig
     if [ "$(gcc --version | awk '{ print $3; exit }')" == "4.5.0" ]; then
 	# "CFLAGS=-O0" is a workaround for GCC 4.5.0 (sed crash)
 	# "CFLAGS=-fno-tree-pta" may be a workaround for GCC 4.5.0 (sed garbage)
@@ -67,7 +68,7 @@
     cp stuff/inetd.conf $fs/etc
     cp stuff/daemon $fs/etc/init.d
     for i in crond dnsd ftpd httpd inetd klogd ntpd syslogd telnetd tftpd \
-    	     udhcpd zcip ; do
+	     udhcpd zcip ; do
 	grep -qi config_$i=y $src/.config &&
 	ln -s daemon $fs/etc/init.d/$i
     done
@@ -106,10 +107,10 @@
 		esac
 		if [ -z "$answer" ]; then
 			echo -n "Keep installed GNU utilities ? "
-			read answer
+			read -t 30 answer	# by default: keep
 			case "$answer" in
-			y*|Y*|o*|O*);;
-			*) break;;
+			n*|N*) break;;
+			*) answer="Y";;
 			esac
 		fi
 		cp -a $1$i $1$i-busybox-install
@@ -126,4 +127,5 @@
 		mv $1$i-busybox-install $1$i
 	done < $1$INSTALLED/$PACKAGE/files.list
 	chmod 4755 $1/bin/busybox
+	sed -i "s@vcsa2txt.*\$@busybox conspy -d | sed 's/ *\$//;/^\$/d;/^Processi\|^.witchi/,\$!d' > /var/log/boot.log@" $1/etc/init.d/rcS
 }
diff -r 7cc5d70d5d9b -r 75dd5efa3105 busybox/receipt
--- a/busybox/receipt	Mon Aug 09 09:37:59 2010 +0200
+++ b/busybox/receipt	Wed Aug 11 12:39:49 2010 +0200
@@ -67,13 +67,16 @@
     mkdir -p $fs/etc/modprobe.d
     # Udhcpc stuff.
     mkdir -p $fs/usr/share/udhcpc
-    cp stuff/udhcp.script  $fs/usr/share/udhcpc/default.script
+    cp stuff/udhcp.script $fs/usr/share/udhcpc/default.script
     chmod +x $fs/usr/share/udhcpc/default.script
     # ZeroConf stuff.
     cp stuff/zcip.script $fs/etc
     # Httpd stuff.
     cp stuff/httpd_helper.sh $fs/usr/bin
     chmod +x $fs/usr/bin/httpd_helper.sh
+    # .desktop stuff
+    mkdir -p $fs/usr/share
+    cp -a stuff/applications $fs/usr/share
 }
 
 # Force glibc-2.7 reinstall if 2.3.6 still in use.
@@ -97,7 +100,7 @@
 			read -t 30 answer	# by default: keep
 			case "$answer" in
 			n*|N*) break;;
-			*) ;;
+			*) answer="Y";;
 			esac
 		fi
 		cp -a $1$i $1$i-busybox-install
@@ -114,4 +117,5 @@
 		mv $1$i-busybox-install $1$i
 	done < $1$INSTALLED/$PACKAGE/files.list
 	chmod 4755 $1/bin/busybox
+	sed -i "s@vcsa2txt.*\$@busybox conspy -d | sed 's/ *\$//;/^\$/d;/^Processi\|^.witchi/,\$!d' > /var/log/boot.log@" $1/etc/init.d/rcS
 }
diff -r 7cc5d70d5d9b -r 75dd5efa3105 mirror-tools/stuff/usr/share/mirror-host/boot/lguest-disk
--- a/mirror-tools/stuff/usr/share/mirror-host/boot/lguest-disk	Mon Aug 09 09:37:59 2010 +0200
+++ b/mirror-tools/stuff/usr/share/mirror-host/boot/lguest-disk	Wed Aug 11 12:39:49 2010 +0200
@@ -23,10 +23,9 @@
 # usage: storelong offset data32 file
 storelong()
 {
-	printf "00000  %02X %02X %02X %02X \n" \
-		$(( $2 & 255 )) $(( ($2>>8) & 255 )) \
-		$(( ($2>>16) & 255 )) $(( ($2>>24) & 255 )) | \
-	hexdump -R | dd bs=1 conv=notrunc of=$3 seek=$(( $1 )) 2> /dev/null
+	echo $2 | awk '{ printf "%c%c%c%c",
+	  $1%256,($1/256)%256,($1/256/256)%256,($1/256/256/256)%256 }' | \
+	dd bs=1 conv=notrunc of=$3 seek=$(( $1 )) 2> /dev/null
 }
 
 # read a 32 bits data