# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1486924786 -3600
# Node ID 10cf1a5f187d5a344b9619da8c6a7fd893eb05ca
# Parent  93fed11eae870dab70690e693914d9f6126606ad
Update config_form()

diff -r 93fed11eae87 -r 10cf1a5f187d base-tiny/receipt
--- a/base-tiny/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/base-tiny/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -21,15 +21,17 @@
 
 config_form()
 {
-	[ -n "$PASSWORD"   ] || PASSWORD=root
-	[ -n "$HOSTNAME"   ] || HOSTNAME=slitaz
-	[ -n "$INTERFACE"  ] || INTERFACE=eth0
-	[ -n "$IP"         ] || IP=192.168.0.6
-	[ -n "$NETMASK"    ] || NETMASK=255.255.255.0
-	[ -n "$GATEWAY"    ] || GATEWAY=192.168.0.1
-	[ -n "$DNS_SERVER" ] || DNS_SERVER='192.168.0.1 192.168.0.2'
-	[ -n "$FSTAB"      ] || FSTAB='/dev/hda1       /mnt         ext3    defaults          0       2'
-	[ -n "$RC_LOCAL"   ] || RC_LOCAL='[ -x /mnt/boot/init ] && /mnt/boot/init'
+	if [ -z "$MODE" ]; then
+		[ -n "$PASSWORD"   ] || PASSWORD=root
+		[ -n "$HOSTNAME"   ] || HOSTNAME=slitaz
+		[ -n "$INTERFACE"  ] || INTERFACE=eth0
+		[ -n "$IP"         ] || IP=192.168.0.6
+		[ -n "$NETMASK"    ] || NETMASK=255.255.255.0
+		[ -n "$GATEWAY"    ] || GATEWAY=192.168.0.1
+		[ -n "$DNS_SERVER" ] || DNS_SERVER='192.168.0.1 192.168.0.2'
+		[ -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
 <table>
 <tr>
@@ -49,7 +51,7 @@
 <td><select name="MODE">
 	<option value="STATIC">STATIC</option>
 	<option value="DHCP"$([ "$MODE" == "DHCP" ] && echo ' selected="selected"')>DHCP</option>
-	<option value="DISABLE">DISABLE</option>
+	<option value="DISABLE"$([ "$MODE" == "DISABLE" ] && echo ' selected="selected"')>DHCP</option>
 </select></td>
 </tr>
 <tr>
@@ -81,7 +83,7 @@
 </textarea></td>
 </tr>
 </table>
-<input type="checkbox" name="KEEP_MODULES" />
+<input type="checkbox" name="KEEP_MODULES" ${KEEP_MODULES:+checked="checked" }/>
 Do not remove the modules files after loading modules.
 EOT
 }
diff -r 93fed11eae87 -r 10cf1a5f187d custom-console/receipt
--- a/custom-console/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/custom-console/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -79,9 +79,10 @@
 EOT
 	for i in $(seq 1 63); do
 		[ $(($i & 7)) -eq 1 ] && echo "<tr>"
+		eval checked="\$TTY$i"
 		cat <<EOT
 <td>
-<input type="checkbox" name="TTY$i" /> tty$i
+<input type="checkbox" name="TTY$i" ${checked:+checked=checked }/> tty$i
 </td>
 EOT
 		[ $(($i & 7)) -eq 0 ] && echo "</tr>"
@@ -95,10 +96,12 @@
 <table>
 EOT
 	for i in $(seq 0 3 | sed 's/^/TTYS/' ; seq 0 3 | sed 's/^/TTYUSB/'); do
+		eval checked="\$$i"
 		cat <<EOT
 <tr>
-<td><input type="checkbox" name="$i" /> ${i/TTY/tty} </td>
+<td><input type="checkbox" name="$i" ${checked:+checked=checked }/> ${i/TTY/tty} </td>
 EOT
+		eval speed="\$SPEED_$i"
 		for j in 115200 57600 38400 19200 9600 4800 2400 1200 600 300; do
 			[ $j -eq 4800 ] && cat <<EOT
 </tr>
@@ -106,7 +109,9 @@
 <td></td>
 EOT
 			checked=
-			[ $j -eq 9600 ] && checked="checked=checked "
+			case " ${speed:+9600} " in
+			*\ $j\ *) checked="checked=checked "
+			esac
 			cat <<EOT
 <td><input type="checkbox" name="SPEED_$i[]" value="$j" $checked/> $j</td>
 EOT
@@ -116,7 +121,7 @@
 </table>
 </tr>
 <p>
-<input type="checkbox" name="ASKFIRST" checked=checked />
+<input type="checkbox" name="ASKFIRST" ${ASKFIRST:+checked=checked }/>
 Confirm console launch (spare some memory)
 </p>
 <p>
@@ -125,14 +130,18 @@
 <option>none</option>
 EOT
 	for i in $(seq 0 3); do
-		echo "<option>ttyS$i</option>"
+		echo -n "<option"
+		[ "$KERNEL_TTY" == "ttyS$i" ] && echo -n ' selected="selected"'
+		echo ">ttyS$i</option>"
 	done
 	cat <<EOT
 </select>
 <select name="SPEED_KERNEL_TTY">
 EOT
 	for i in 115200 57600 38400 19200 9600 4800 2400 1200 600 300; do
-		echo "<option>$i</option>"
+		echo -n "<option"
+		[ "$SPEED_KERNEL_TTY" == "$i" ] && echo -n ' selected="selected"'
+		echo ">$i</option>"
 	done
 	echo -e "</select>\n</p>"
 }
diff -r 93fed11eae87 -r 10cf1a5f187d dropbear-without-zlib/receipt
--- a/dropbear-without-zlib/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/dropbear-without-zlib/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -98,7 +98,7 @@
 	RSAPUB="$(dropbearkey  -y -f /tmp/mkssh$$ | grep ^ssh)"
 	rm -f /tmp/mkssh$$
 	cat <<EOT
-<input type="checkbox" name="STARTDAEMON" value="ON" checked="checked" />
+<input type="checkbox" name="STARTDAEMON" value="ON" ${STARTDAEMON:+checked="checked" }/>
 Start server during boot<br>
 <table>
 <tr>
diff -r 93fed11eae87 -r 10cf1a5f187d dropbear/receipt
--- a/dropbear/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/dropbear/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -100,7 +100,7 @@
 	RSAPUB="$(dropbearkey  -y -f /tmp/mkssh$$ | grep ^ssh)"
 	rm -f /tmp/mkssh$$
 	cat <<EOT
-<input type="checkbox" name="STARTDAEMON" value="ON" checked="checked" />
+<input type="checkbox" name="STARTDAEMON" value="ON" ${STARTDAEMON:+checked="checked" }/>
 Start server during boot<br>
 <table>
 <tr>
diff -r 93fed11eae87 -r 10cf1a5f187d fbvnc-ssh/receipt
--- a/fbvnc-ssh/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/fbvnc-ssh/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -18,24 +18,22 @@
 
 config_form()
 {
-	[ "$VNCONLY" == "no" ] || VNCONLY=yes
-	[ -n "$VNCUSER" ] || VNCUSER=tux
 	cat <<EOT
 <table>
 <tr>
 <td>SSH user for the VNC server</td>
-<td><input type="text" name="VNCUSER" value="$VNCUSER"></td>
+<td><input type="text" name="VNCUSER" value="${VNCUSER:+tux}"></td>
 </tr>
 <tr>
 <td>Remove virtual consoles ?</td>
 <td>
 <input type="radio" name="VNCONLY" $([ "$VNCONLY" == "no" ] && echo "checked=checked ")value="no"> keep virtual consoles 3 to 6
-<input type="radio" name="VNCONLY" $([ "$VNCONLY" == "yes" ] && echo "checked=checked ")value="yes"> keep VNC console only
+<input type="radio" name="VNCONLY" $([ "$VNCONLY" != "no" ] && echo "checked=checked ")value="yes"> keep VNC console only
 </td>
 </tr>
 </table>
 <p>
-<input type="checkbox" name="ASKFIRST" checked=checked />
+<input type="checkbox" name="ASKFIRST" ${ASKFIRST:+checked=checked }/>
 Confirm VNC console launch (spare some memory)
 </p>
 <p>
diff -r 93fed11eae87 -r 10cf1a5f187d ftp-config/receipt
--- a/ftp-config/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/ftp-config/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -18,10 +18,9 @@
 
 config_form()
 {
-	[ "$UPLOAD" == "on" ] && UPLOAD="ckecked=ckecked " || UPLOAD=
 	cat <<EOT
-FTP root <input type="text" name="ROOT" >
-allow upload <input type="checkbox" name="UPLOAD" $UPLOAD>
+FTP root <input type="text" name="ROOT" ${ROOT:+value="$ROOT" }>
+allow upload <input type="checkbox" name="UPLOAD" ${UPLOAD:+checked="checked" }>
 EOT
 }
 
diff -r 93fed11eae87 -r 10cf1a5f187d gpxe/receipt
--- a/gpxe/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/gpxe/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -57,7 +57,8 @@
 	cat <<EOT
 Boot url list :
 <textarea name="URLS" cols="60" rows="5" wrap="off">
-$URLS
+${URLS:-$(dd if=$1/usr/share/boot/gpxe.pxe bs=1 skip=5 count=256 2>/dev/null | \
+	strings | sed s'/,/\n/g')}
 </textarea>
 EOT
 }
diff -r 93fed11eae87 -r 10cf1a5f187d hardware-ibm-6272/receipt
--- a/hardware-ibm-6272/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/hardware-ibm-6272/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -66,9 +66,9 @@
 <table>
 <tr>
 <td>Allowed IRQ for the Ethernet driver cs89x0</td>
-<td><input type="text" name="IRQ_CS89X0_LIST" value="${IRQ_LIST:-15 12 11 10 9 7 6 5 4 3}" /></td>
+<td><input type="text" name="IRQ_CS89X0_LIST" value="${IRQ_CS89X0_LIST:-15 12 11 10 9 7 6 5 4 3}" /></td>
 </tr>
 </table>
-<input type="checkbox" name="CS89X0_WIPEPNP" />Remove PNP binaries after use<br>
+<input type="checkbox" name="CS89X0_WIPEPNP" ${CS89X0_WIPEPNP:+checked="checked" }/>Remove PNP binaries after use<br>
 EOT
 }
diff -r 93fed11eae87 -r 10cf1a5f187d keyboard/receipt
--- a/keyboard/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/keyboard/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -134,7 +134,7 @@
 </select></td>
 </tr>
 </table>
-<input type="checkbox" name="USECMDLINE" $([ "$USECMDLINE" == "on" ] && echo "checked=checked ")value="yes">
+<input type="checkbox" name="USECMDLINE" ${USECMDLINE:+checked=checked }value="yes">
 Use the kernel command line arguments <b><i>kmap=</i></b>,
 <b><i>lang=</i></b> and <b><i>tz=</i></b> (+200Kb).
 EOT
diff -r 93fed11eae87 -r 10cf1a5f187d lan-config/receipt
--- a/lan-config/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/lan-config/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -53,9 +53,11 @@
 
 config_form()
 {
-	[ -n "$INTERFACE"  ] || INTERFACE=eth1
-	[ -n "$IP"         ] || IP=192.168.0.6
-	[ -n "$NETMASK"    ] || NETMASK=255.255.255.0
+	if [ -z "$MODE" ]; then
+		INTERFACE=eth1
+		IP=192.168.0.6
+		NETMASK=255.255.255.0
+	fi
 	cat <<EOT
 <table>
 <tr>
@@ -78,7 +80,7 @@
 <td><input type="text" name="NETMASK" value="$NETMASK" /></td>
 </tr>
 </table>
-<input type="checkbox" name="ROUTING" value="ON" checked="checked" />
+<input type="checkbox" name="ROUTING" ${ROUTING:+value="ON" checked="checked" }/>
 Enable LAN routing<br>
 EOT
 }
diff -r 93fed11eae87 -r 10cf1a5f187d lpd-config/receipt
--- a/lpd-config/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/lpd-config/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -2,7 +2,7 @@
 
 PACKAGE="lpd-config"
 VERSION="1.0"
-CATEGORY="system"
+CATEGORY="meta"
 SHORT_DESC="Line printer server configuration (without spooling)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
@@ -13,14 +13,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/var/spool $fs/dev
+	mkdir -p $fs/var/spool
 }
 
 config_form()
 {
 	cat <<EOT
 Respective printer names for lp0, lp1 ... 
-<input type="text" name="LP_NAMES" value="$LP_NAMES" >
+<input type="text" name="LP_NAMES" value="${LP_NAMES:-printer}" >
 EOT
 }
 
diff -r 93fed11eae87 -r 10cf1a5f187d lpd-spooling-config/receipt
--- a/lpd-spooling-config/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/lpd-spooling-config/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -21,7 +21,7 @@
 {
 	cat <<EOT
 Respective printer names for lp0, lp1 ... 
-<input type="text" name="LP_NAMES" value="$LP_NAMES" >
+<input type="text" name="LP_NAMES" value="${LP_NAMES:-printer}" >
 EOT
 }
 
diff -r 93fed11eae87 -r 10cf1a5f187d module-3c509/receipt
--- a/module-3c509/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/module-3c509/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -41,7 +41,7 @@
 <table>
 <tr>
 <td>IRQ</td>
-<td><input type="text" name="IRQ3C509" /></td>
+<td><input type="text" name="IRQ3C509" ${IRQ3C509:+value="$IRQ3C509" } /></td>
 </tr>
 <tr>
 <td>Tranceiver</td>
diff -r 93fed11eae87 -r 10cf1a5f187d module-cs89x0/receipt
--- a/module-cs89x0/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/module-cs89x0/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -42,12 +42,12 @@
 <table>
 <tr>
 <td>I/O base</td>
-<td><input type="text" name="IOCS89"
+<td><input type="text" name="IOCS89" ${IOCS89:+value="$IOCS89" }
 title="Likely 0x300 0x320 0x340 0x360 0x200 0x220 0x240 0x260 0x280 0x2a0 0x2c0 or 0x2e0" /></td>
 </tr>
 <tr>
 <td>IRQ</td>
-<td><input type="text" name="IRQCS89" title "Likely 10 11 12 or 5" /></td>
+<td><input type="text" name="IRQCS89" title "Likely 10 11 12 or 5" ${IRQCS89:+value="$IRQCS89" }/></td>
 </tr>
 <tr>
 <td>Media</td>
diff -r 93fed11eae87 -r 10cf1a5f187d module-ne/receipt
--- a/module-ne/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/module-ne/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -37,20 +37,24 @@
 
 config_form()
 {
+	if [ -n "$IONE2K" ]; then
+		IONE2K=0x300
+		BADNE2K=on
+	fi
 	cat <<EOT
 <h4>NE2000 isa Ethernet driver</h4>
 <table>
 <tr>
 <td>I/O base (required)</td>
-<td><input type="text" name="IONE2K" value="0x300" 
+<td><input type="text" name="IONE2K" ${IONE2K:+value="$IONE2K"}
 title="Likely 0x300 0x280 0x320 0x340 0x360 or 0x380" /></td>
 </tr>
 <tr>
 <td>IRQ (optionnal)</td>
-<td><input type="text" name="IRQNE2K" /></td>
+<td><input type="text" name="IRQNE2K" ${IRQNE2K:+value="$IRQNE2K" }/></td>
 </tr>
 </table>
-<input type="checkbox" name="BADNE2K" value="ON" />
+<input type="checkbox" name="BADNE2K" ${BADNE2K:+value="on" }/>
 Accept card with bad signatures<br>
 EOT
 }
diff -r 93fed11eae87 -r 10cf1a5f187d module-tlan/receipt
--- a/module-tlan/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/module-tlan/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -34,6 +34,10 @@
 
 config_form()
 {
+	if [ -z "$SPEEDTLAN" ]; then
+		AUITLAN=on
+		BIGBUFTLAN=on
+	fi
 	cat <<EOT
 <h4>TI ThunderLAN based ethernet PCI adapter</h4>
 <table>
@@ -54,9 +58,9 @@
 </select></td>
 </tr>
 </table>
-<input type="checkbox" name="AUITLAN" value="1" />
+<input type="checkbox" name="AUITLAN" ${AUITLAN:+value="on" }/>
 ThunderLAN use AUI port(s)<br>
-<input type="checkbox" name="BIGBUFTLAN" value="1" />
+<input type="checkbox" name="BIGBUFTLAN" ${BIGBUFTLAN:+value="on" }/>
 ThunderLAN use big buffer<br>
 EOT
 }
diff -r 93fed11eae87 -r 10cf1a5f187d rsync/receipt
--- a/rsync/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/rsync/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -48,23 +48,20 @@
 
 config_form()
 {
-	[ "$START" == "on" ] && START="ckecked=ckecked " || START=
-	[ -n "$RSYNCD_CONF" ] || RSYNCD_CONF="$(cat $1/etc/rsyncd.conf)"
-	[ -n "$RSYNCD_SECRETS" ] || RSYNCD_SECRETS="$(cat $1/etc/rsyncd.secrets)"
 	cat <<EOT
 <p>
-<input type="checkbox" name="START" $START> start rsync daemon during boot
+<input type="checkbox" name="START" ${START:+ckecked=ckecked }> start rsync daemon during boot
 </p>
 <fieldset>
 <legend><i>/etc/rsyncd.conf</i></legend>
 <textarea name="RSYNCD_CONF" rows="15" cols="60" wrap="off">
-$RSYNCD_CONF
+${RSYNCD_CONF:-$(cat $1/etc/rsyncd.conf)}
 </textarea>
 </fieldset>
 <fieldset>
 <legend><i>/etc/rsyncd.secrets</i></legend>
 <textarea name="RSYNCD_SECRETS" cols="60" wrap="off">
-$RSYNCD_SECRETS
+${RSYNCD_SECRETS:-$(cat $1/etc/rsyncd.secrets)}
 </textarea>
 </fieldset>
 <fieldset>
diff -r 93fed11eae87 -r 10cf1a5f187d wiki/receipt
--- a/wiki/receipt	Sat Feb 11 16:00:15 2017 +0100
+++ b/wiki/receipt	Sun Feb 12 19:39:46 2017 +0100
@@ -45,14 +45,12 @@
 
 config_form()
 {
-	[ -n "$WIKI_PASSWORD"   ] || WIKI_PASSWORD=test
 	cat <<EOT
 <table>
 <tr>
 <td>Wiki password</td>
-<td><input type="text" name="WIKI_PASSWORD" value="$WIKI_PASSWORD" /></td>
+<td><input type="text" name="WIKI_PASSWORD" value="${WIKI_PASSWORD:-test}" /></td>
 </tr>
 </table>
 EOT
 }
-