wok-tiny diff busybox/receipt @ rev 159
Add geninitramfs & busybox-net (again)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Feb 28 18:25:15 2020 +0100 (2020-02-28) |
parents | 2ecf107b3ad9 |
children | 562a49ca00d9 |
line diff
1.1 --- a/busybox/receipt Fri Feb 28 17:08:39 2020 +0100 1.2 +++ b/busybox/receipt Fri Feb 28 18:25:15 2020 +0100 1.3 @@ -90,11 +90,9 @@ 1.4 ln -s daemon $fs/etc/init.d/$i 1.5 done 1.6 sed -i 's|network.sh ||' $fs/etc/rcS.conf 1.7 - sed -i 's|Executing all initialization scripts.*|&\ 1.8 - # Set hostname\ 1.9 - echo -n "Setting hostname..."\ 1.10 - hostname -F /etc/hostname\ 1.11 - status\n|' $fs/etc/init.d/rcS 1.12 + sed -i 's|.*Executing all initialization scripts|echo -n "Setting hostname..."\ 1.13 +hostname -F /etc/hostname\ 1.14 +status\n&|' $fs/etc/init.d/rcS 1.15 rm -f $fs/etc/init.d/network.sh $fs/etc/network.conf \ 1.16 $fs/etc/services $fs/etc/networks $fs/etc/inetd.conf \ 1.17 $fs/etc/host.conf $fs/etc/hosts 1.18 @@ -111,14 +109,13 @@ 1.19 1.20 config_form() 1.21 { 1.22 - if [ -z "$BBCONF" ]; then 1.23 + if [ -z "$BBHOST" ]; then 1.24 [ -n "$PASSWORD" ] || PASSWORD=root 1.25 [ -n "$BBHOST" ] || BBHOST=slitaz 1.26 [ -n "$FSTAB" ] || FSTAB='/dev/hda1 /mnt ext3 defaults 0 2' 1.27 [ -n "$RC_LOCAL" ] || RC_LOCAL='[ -x /mnt/boot/init ] && /mnt/boot/init' 1.28 fi 1.29 cat <<EOT 1.30 -<input type="hidden" name="BBCONF" value="done" /> 1.31 <table> 1.32 <tr> 1.33 <td>Root password (empty=disable)</td> 1.34 @@ -195,7 +192,7 @@ 1.35 grep -qs ^root:: /etc/passwd /etc/shadow && passwd 1.36 EOT 1.37 fi 1.38 - [ -n "$HOSTNAME" ] && echo $HOSTNAME > $1/etc/hostname 1.39 + [ -n "$BBHOST" ] && echo $BBHOST > $1/etc/hostname 1.40 [ -n "$FSTAB" ] && dos2unix >> $1/etc/fstab <<EOT 1.41 $FSTAB 1.42 EOT