wok 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 7cc5d70d5d9b
children 029092db0791
files busybox-pam/receipt busybox/receipt mirror-tools/stuff/usr/share/mirror-host/boot/lguest-disk
line diff
     1.1 --- a/busybox-pam/receipt	Mon Aug 09 09:37:59 2010 +0200
     1.2 +++ b/busybox-pam/receipt	Wed Aug 11 12:39:49 2010 +0200
     1.3 @@ -35,6 +35,7 @@
     1.4  EOT
     1.5      cp $WOK/$SOURCE/stuff/$SOURCE-$VERSION.config .config
     1.6      sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config
     1.7 +    make oldconfig
     1.8      if [ "$(gcc --version | awk '{ print $3; exit }')" == "4.5.0" ]; then
     1.9  	# "CFLAGS=-O0" is a workaround for GCC 4.5.0 (sed crash)
    1.10  	# "CFLAGS=-fno-tree-pta" may be a workaround for GCC 4.5.0 (sed garbage)
    1.11 @@ -67,7 +68,7 @@
    1.12      cp stuff/inetd.conf $fs/etc
    1.13      cp stuff/daemon $fs/etc/init.d
    1.14      for i in crond dnsd ftpd httpd inetd klogd ntpd syslogd telnetd tftpd \
    1.15 -    	     udhcpd zcip ; do
    1.16 +	     udhcpd zcip ; do
    1.17  	grep -qi config_$i=y $src/.config &&
    1.18  	ln -s daemon $fs/etc/init.d/$i
    1.19      done
    1.20 @@ -106,10 +107,10 @@
    1.21  		esac
    1.22  		if [ -z "$answer" ]; then
    1.23  			echo -n "Keep installed GNU utilities ? "
    1.24 -			read answer
    1.25 +			read -t 30 answer	# by default: keep
    1.26  			case "$answer" in
    1.27 -			y*|Y*|o*|O*);;
    1.28 -			*) break;;
    1.29 +			n*|N*) break;;
    1.30 +			*) answer="Y";;
    1.31  			esac
    1.32  		fi
    1.33  		cp -a $1$i $1$i-busybox-install
    1.34 @@ -126,4 +127,5 @@
    1.35  		mv $1$i-busybox-install $1$i
    1.36  	done < $1$INSTALLED/$PACKAGE/files.list
    1.37  	chmod 4755 $1/bin/busybox
    1.38 +	sed -i "s@vcsa2txt.*\$@busybox conspy -d | sed 's/ *\$//;/^\$/d;/^Processi\|^.witchi/,\$!d' > /var/log/boot.log@" $1/etc/init.d/rcS
    1.39  }
     2.1 --- a/busybox/receipt	Mon Aug 09 09:37:59 2010 +0200
     2.2 +++ b/busybox/receipt	Wed Aug 11 12:39:49 2010 +0200
     2.3 @@ -67,13 +67,16 @@
     2.4      mkdir -p $fs/etc/modprobe.d
     2.5      # Udhcpc stuff.
     2.6      mkdir -p $fs/usr/share/udhcpc
     2.7 -    cp stuff/udhcp.script  $fs/usr/share/udhcpc/default.script
     2.8 +    cp stuff/udhcp.script $fs/usr/share/udhcpc/default.script
     2.9      chmod +x $fs/usr/share/udhcpc/default.script
    2.10      # ZeroConf stuff.
    2.11      cp stuff/zcip.script $fs/etc
    2.12      # Httpd stuff.
    2.13      cp stuff/httpd_helper.sh $fs/usr/bin
    2.14      chmod +x $fs/usr/bin/httpd_helper.sh
    2.15 +    # .desktop stuff
    2.16 +    mkdir -p $fs/usr/share
    2.17 +    cp -a stuff/applications $fs/usr/share
    2.18  }
    2.19  
    2.20  # Force glibc-2.7 reinstall if 2.3.6 still in use.
    2.21 @@ -97,7 +100,7 @@
    2.22  			read -t 30 answer	# by default: keep
    2.23  			case "$answer" in
    2.24  			n*|N*) break;;
    2.25 -			*) ;;
    2.26 +			*) answer="Y";;
    2.27  			esac
    2.28  		fi
    2.29  		cp -a $1$i $1$i-busybox-install
    2.30 @@ -114,4 +117,5 @@
    2.31  		mv $1$i-busybox-install $1$i
    2.32  	done < $1$INSTALLED/$PACKAGE/files.list
    2.33  	chmod 4755 $1/bin/busybox
    2.34 +	sed -i "s@vcsa2txt.*\$@busybox conspy -d | sed 's/ *\$//;/^\$/d;/^Processi\|^.witchi/,\$!d' > /var/log/boot.log@" $1/etc/init.d/rcS
    2.35  }
     3.1 --- a/mirror-tools/stuff/usr/share/mirror-host/boot/lguest-disk	Mon Aug 09 09:37:59 2010 +0200
     3.2 +++ b/mirror-tools/stuff/usr/share/mirror-host/boot/lguest-disk	Wed Aug 11 12:39:49 2010 +0200
     3.3 @@ -23,10 +23,9 @@
     3.4  # usage: storelong offset data32 file
     3.5  storelong()
     3.6  {
     3.7 -	printf "00000  %02X %02X %02X %02X \n" \
     3.8 -		$(( $2 & 255 )) $(( ($2>>8) & 255 )) \
     3.9 -		$(( ($2>>16) & 255 )) $(( ($2>>24) & 255 )) | \
    3.10 -	hexdump -R | dd bs=1 conv=notrunc of=$3 seek=$(( $1 )) 2> /dev/null
    3.11 +	echo $2 | awk '{ printf "%c%c%c%c",
    3.12 +	  $1%256,($1/256)%256,($1/256/256)%256,($1/256/256/256)%256 }' | \
    3.13 +	dd bs=1 conv=notrunc of=$3 seek=$(( $1 )) 2> /dev/null
    3.14  }
    3.15  
    3.16  # read a 32 bits data