# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1582910715 -3600
# Node ID 45eaacc1faf86288c9b5d164620f464ed3f4f3b0
# Parent  2ecf107b3ad902ce77283b503b050af0b9528558
Add geninitramfs & busybox-net (again)

diff -r 2ecf107b3ad9 -r 45eaacc1faf8 busybox-net/receipt
--- a/busybox-net/receipt	Fri Feb 28 17:08:39 2020 +0100
+++ b/busybox-net/receipt	Fri Feb 28 18:25:15 2020 +0100
@@ -85,7 +85,7 @@
 	etc/inetd.conf etc/host.conf etc/hosts ; do
 	cp -a $WOK/base-tiny/stuff/$i $fs/$i
     done
-     sed '/hostname/{Nd}' -i etc/init.d/network.sh
+    sed '/hostname/{Nd}' -i $fs/etc/init.d/network.sh
 	
     # Busybox config files.
     touch $fs/etc/resolv.conf
@@ -112,7 +112,6 @@
 config_form()
 {
 	if [ -z "$MODE" ]; then
-		[ -n "$HOSTNAME"   ] || HOSTNAME=slitaz
 		[ -n "$INTERFACE"  ] || INTERFACE=eth0
 		[ -n "$IP"         ] || IP=192.168.0.6
 		[ -n "$NETMASK"    ] || NETMASK=255.255.255.0
@@ -122,10 +121,6 @@
 	cat <<EOT
 <table>
 <tr>
-<td>Host name</td>
-<td><input type="text" name="HOSTNAME" value="$HOSTNAME" /></td>
-</tr>
-<tr>
 <td>Interface</td>
 <td><input type="text" name="INTERFACE" value="$INTERFACE" /></td>
 </tr>
diff -r 2ecf107b3ad9 -r 45eaacc1faf8 busybox/receipt
--- a/busybox/receipt	Fri Feb 28 17:08:39 2020 +0100
+++ b/busybox/receipt	Fri Feb 28 18:25:15 2020 +0100
@@ -90,11 +90,9 @@
 	ln -s daemon $fs/etc/init.d/$i
     done
     sed -i 's|network.sh ||' $fs/etc/rcS.conf
-    sed -i 's|Executing all initialization scripts.*|&\
-	# Set hostname\
-	echo -n "Setting hostname..."\
-	hostname -F /etc/hostname\
-	status\n|' $fs/etc/init.d/rcS
+    sed -i 's|.*Executing all initialization scripts|echo -n "Setting hostname..."\
+hostname -F /etc/hostname\
+status\n&|' $fs/etc/init.d/rcS
     rm -f $fs/etc/init.d/network.sh $fs/etc/network.conf \
 	$fs/etc/services $fs/etc/networks $fs/etc/inetd.conf \
 	$fs/etc/host.conf $fs/etc/hosts
@@ -111,14 +109,13 @@
 
 config_form()
 {
-	if [ -z "$BBCONF" ]; then
+	if [ -z "$BBHOST" ]; then
 		[ -n "$PASSWORD"   ] || PASSWORD=root
 		[ -n "$BBHOST"     ] || BBHOST=slitaz
 		[ -n "$FSTAB"      ] || FSTAB='/dev/hda1       /mnt         ext3    defaults          0       2'
 		[ -n "$RC_LOCAL"   ] || RC_LOCAL='[ -x /mnt/boot/init ] && /mnt/boot/init'
 	fi
 	cat <<EOT
-<input type="hidden" name="BBCONF" value="done" />
 <table>
 <tr>
 <td>Root password (empty=disable)</td>
@@ -195,7 +192,7 @@
 grep -qs ^root:: /etc/passwd /etc/shadow && passwd
 EOT
 	fi
-	[ -n "$HOSTNAME" ] && echo $HOSTNAME > $1/etc/hostname
+	[ -n "$BBHOST" ] && echo $BBHOST > $1/etc/hostname
 	[ -n "$FSTAB" ] && dos2unix >> $1/etc/fstab <<EOT
 $FSTAB
 EOT
diff -r 2ecf107b3ad9 -r 45eaacc1faf8 busybox/stuff/busybox-git.config
--- a/busybox/stuff/busybox-git.config	Fri Feb 28 17:08:39 2020 +0100
+++ b/busybox/stuff/busybox-git.config	Fri Feb 28 18:25:15 2020 +0100
@@ -404,7 +404,7 @@
 # CONFIG_FEATURE_DIFF_DIR is not set
 # CONFIG_ED is not set
 # CONFIG_PATCH is not set
-# CONFIG_SED is not set
+CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=1024
 # CONFIG_FEATURE_VI_8BIT is not set
diff -r 2ecf107b3ad9 -r 45eaacc1faf8 geninitramfs/receipt
--- a/geninitramfs/receipt	Fri Feb 28 17:08:39 2020 +0100
+++ b/geninitramfs/receipt	Fri Feb 28 18:25:15 2020 +0100
@@ -7,7 +7,6 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://tiny.slitaz.org/"
-DEPENDS="busybox-net"	# sed
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 2ecf107b3ad9 -r 45eaacc1faf8 geninitramfs/stuff/geninitramfs
--- a/geninitramfs/stuff/geninitramfs	Fri Feb 28 17:08:39 2020 +0100
+++ b/geninitramfs/stuff/geninitramfs	Fri Feb 28 18:25:15 2020 +0100
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 mkdir -p /boot/fs$$/bin /boot/fs$$/lib /boot/fs$$/proc /boot/fs$$/mnt
-cp -a /lib/modules /boot/fs$$/lib
-cp -a /bin/busybox /boot/fs$$/bin
+cp -dpR /lib/modules /boot/fs$$/lib
+cp -p /bin/busybox /boot/fs$$/bin
 ln /boot/fs$$/bin/busybox /boot/fs$$/bin/sh
-cp -a /lib/ld* /lib/libc.so* /lib/libuClibc* /lib/libcrypt* /boot/fs$$/lib
+cp -d /lib/ld* /lib/libc.so* /lib/libuClibc* /lib/libcrypt* /boot/fs$$/lib
 sed -i 's|^LOAD_MODULES=.*|# &|' /etc/rcS.conf
 sed '/LOAD_MODULES/!d;s|^# ||' /etc/rcS.conf > /boot/fs$$/vars
 . /boot/fs$$/vars
@@ -19,7 +19,7 @@
 	modprobe \${mod//|/ }
 done
 echo
-mount \$(blkid | sed "/\$root/!d;s|: .*||") /mnt
+mount \$(blkid | sed "/${1:-\$root}/!d;s|: .*||") /mnt
 umount /proc
 switch_root /mnt /init
 EOT