wok-tiny rev 126
Update config_form()
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sun Feb 12 19:39:46 2017 +0100 (2017-02-12) |
| parents | 93fed11eae87 |
| children | 34a749493ee3 |
| files | base-tiny/receipt custom-console/receipt dropbear-without-zlib/receipt dropbear/receipt fbvnc-ssh/receipt ftp-config/receipt gpxe/receipt hardware-ibm-6272/receipt keyboard/receipt lan-config/receipt lpd-config/receipt lpd-spooling-config/receipt module-3c509/receipt module-cs89x0/receipt module-ne/receipt module-tlan/receipt rsync/receipt wiki/receipt |
line diff
1.1 --- a/base-tiny/receipt Sat Feb 11 16:00:15 2017 +0100 1.2 +++ b/base-tiny/receipt Sun Feb 12 19:39:46 2017 +0100 1.3 @@ -21,15 +21,17 @@ 1.4 1.5 config_form() 1.6 { 1.7 - [ -n "$PASSWORD" ] || PASSWORD=root 1.8 - [ -n "$HOSTNAME" ] || HOSTNAME=slitaz 1.9 - [ -n "$INTERFACE" ] || INTERFACE=eth0 1.10 - [ -n "$IP" ] || IP=192.168.0.6 1.11 - [ -n "$NETMASK" ] || NETMASK=255.255.255.0 1.12 - [ -n "$GATEWAY" ] || GATEWAY=192.168.0.1 1.13 - [ -n "$DNS_SERVER" ] || DNS_SERVER='192.168.0.1 192.168.0.2' 1.14 - [ -n "$FSTAB" ] || FSTAB='/dev/hda1 /mnt ext3 defaults 0 2' 1.15 - [ -n "$RC_LOCAL" ] || RC_LOCAL='[ -x /mnt/boot/init ] && /mnt/boot/init' 1.16 + if [ -z "$MODE" ]; then 1.17 + [ -n "$PASSWORD" ] || PASSWORD=root 1.18 + [ -n "$HOSTNAME" ] || HOSTNAME=slitaz 1.19 + [ -n "$INTERFACE" ] || INTERFACE=eth0 1.20 + [ -n "$IP" ] || IP=192.168.0.6 1.21 + [ -n "$NETMASK" ] || NETMASK=255.255.255.0 1.22 + [ -n "$GATEWAY" ] || GATEWAY=192.168.0.1 1.23 + [ -n "$DNS_SERVER" ] || DNS_SERVER='192.168.0.1 192.168.0.2' 1.24 + [ -n "$FSTAB" ] || FSTAB='/dev/hda1 /mnt ext3 defaults 0 2' 1.25 + [ -n "$RC_LOCAL" ] || RC_LOCAL='[ -x /mnt/boot/init ] && /mnt/boot/init' 1.26 + fi 1.27 cat <<EOT 1.28 <table> 1.29 <tr> 1.30 @@ -49,7 +51,7 @@ 1.31 <td><select name="MODE"> 1.32 <option value="STATIC">STATIC</option> 1.33 <option value="DHCP"$([ "$MODE" == "DHCP" ] && echo ' selected="selected"')>DHCP</option> 1.34 - <option value="DISABLE">DISABLE</option> 1.35 + <option value="DISABLE"$([ "$MODE" == "DISABLE" ] && echo ' selected="selected"')>DHCP</option> 1.36 </select></td> 1.37 </tr> 1.38 <tr> 1.39 @@ -81,7 +83,7 @@ 1.40 </textarea></td> 1.41 </tr> 1.42 </table> 1.43 -<input type="checkbox" name="KEEP_MODULES" /> 1.44 +<input type="checkbox" name="KEEP_MODULES" ${KEEP_MODULES:+checked="checked" }/> 1.45 Do not remove the modules files after loading modules. 1.46 EOT 1.47 }
2.1 --- a/custom-console/receipt Sat Feb 11 16:00:15 2017 +0100 2.2 +++ b/custom-console/receipt Sun Feb 12 19:39:46 2017 +0100 2.3 @@ -79,9 +79,10 @@ 2.4 EOT 2.5 for i in $(seq 1 63); do 2.6 [ $(($i & 7)) -eq 1 ] && echo "<tr>" 2.7 + eval checked="\$TTY$i" 2.8 cat <<EOT 2.9 <td> 2.10 -<input type="checkbox" name="TTY$i" /> tty$i 2.11 +<input type="checkbox" name="TTY$i" ${checked:+checked=checked }/> tty$i 2.12 </td> 2.13 EOT 2.14 [ $(($i & 7)) -eq 0 ] && echo "</tr>" 2.15 @@ -95,10 +96,12 @@ 2.16 <table> 2.17 EOT 2.18 for i in $(seq 0 3 | sed 's/^/TTYS/' ; seq 0 3 | sed 's/^/TTYUSB/'); do 2.19 + eval checked="\$$i" 2.20 cat <<EOT 2.21 <tr> 2.22 -<td><input type="checkbox" name="$i" /> ${i/TTY/tty} </td> 2.23 +<td><input type="checkbox" name="$i" ${checked:+checked=checked }/> ${i/TTY/tty} </td> 2.24 EOT 2.25 + eval speed="\$SPEED_$i" 2.26 for j in 115200 57600 38400 19200 9600 4800 2400 1200 600 300; do 2.27 [ $j -eq 4800 ] && cat <<EOT 2.28 </tr> 2.29 @@ -106,7 +109,9 @@ 2.30 <td></td> 2.31 EOT 2.32 checked= 2.33 - [ $j -eq 9600 ] && checked="checked=checked " 2.34 + case " ${speed:+9600} " in 2.35 + *\ $j\ *) checked="checked=checked " 2.36 + esac 2.37 cat <<EOT 2.38 <td><input type="checkbox" name="SPEED_$i[]" value="$j" $checked/> $j</td> 2.39 EOT 2.40 @@ -116,7 +121,7 @@ 2.41 </table> 2.42 </tr> 2.43 <p> 2.44 -<input type="checkbox" name="ASKFIRST" checked=checked /> 2.45 +<input type="checkbox" name="ASKFIRST" ${ASKFIRST:+checked=checked }/> 2.46 Confirm console launch (spare some memory) 2.47 </p> 2.48 <p> 2.49 @@ -125,14 +130,18 @@ 2.50 <option>none</option> 2.51 EOT 2.52 for i in $(seq 0 3); do 2.53 - echo "<option>ttyS$i</option>" 2.54 + echo -n "<option" 2.55 + [ "$KERNEL_TTY" == "ttyS$i" ] && echo -n ' selected="selected"' 2.56 + echo ">ttyS$i</option>" 2.57 done 2.58 cat <<EOT 2.59 </select> 2.60 <select name="SPEED_KERNEL_TTY"> 2.61 EOT 2.62 for i in 115200 57600 38400 19200 9600 4800 2400 1200 600 300; do 2.63 - echo "<option>$i</option>" 2.64 + echo -n "<option" 2.65 + [ "$SPEED_KERNEL_TTY" == "$i" ] && echo -n ' selected="selected"' 2.66 + echo ">$i</option>" 2.67 done 2.68 echo -e "</select>\n</p>" 2.69 }
3.1 --- a/dropbear-without-zlib/receipt Sat Feb 11 16:00:15 2017 +0100 3.2 +++ b/dropbear-without-zlib/receipt Sun Feb 12 19:39:46 2017 +0100 3.3 @@ -98,7 +98,7 @@ 3.4 RSAPUB="$(dropbearkey -y -f /tmp/mkssh$$ | grep ^ssh)" 3.5 rm -f /tmp/mkssh$$ 3.6 cat <<EOT 3.7 -<input type="checkbox" name="STARTDAEMON" value="ON" checked="checked" /> 3.8 +<input type="checkbox" name="STARTDAEMON" value="ON" ${STARTDAEMON:+checked="checked" }/> 3.9 Start server during boot<br> 3.10 <table> 3.11 <tr>
4.1 --- a/dropbear/receipt Sat Feb 11 16:00:15 2017 +0100 4.2 +++ b/dropbear/receipt Sun Feb 12 19:39:46 2017 +0100 4.3 @@ -100,7 +100,7 @@ 4.4 RSAPUB="$(dropbearkey -y -f /tmp/mkssh$$ | grep ^ssh)" 4.5 rm -f /tmp/mkssh$$ 4.6 cat <<EOT 4.7 -<input type="checkbox" name="STARTDAEMON" value="ON" checked="checked" /> 4.8 +<input type="checkbox" name="STARTDAEMON" value="ON" ${STARTDAEMON:+checked="checked" }/> 4.9 Start server during boot<br> 4.10 <table> 4.11 <tr>
5.1 --- a/fbvnc-ssh/receipt Sat Feb 11 16:00:15 2017 +0100 5.2 +++ b/fbvnc-ssh/receipt Sun Feb 12 19:39:46 2017 +0100 5.3 @@ -18,24 +18,22 @@ 5.4 5.5 config_form() 5.6 { 5.7 - [ "$VNCONLY" == "no" ] || VNCONLY=yes 5.8 - [ -n "$VNCUSER" ] || VNCUSER=tux 5.9 cat <<EOT 5.10 <table> 5.11 <tr> 5.12 <td>SSH user for the VNC server</td> 5.13 -<td><input type="text" name="VNCUSER" value="$VNCUSER"></td> 5.14 +<td><input type="text" name="VNCUSER" value="${VNCUSER:+tux}"></td> 5.15 </tr> 5.16 <tr> 5.17 <td>Remove virtual consoles ?</td> 5.18 <td> 5.19 <input type="radio" name="VNCONLY" $([ "$VNCONLY" == "no" ] && echo "checked=checked ")value="no"> keep virtual consoles 3 to 6 5.20 -<input type="radio" name="VNCONLY" $([ "$VNCONLY" == "yes" ] && echo "checked=checked ")value="yes"> keep VNC console only 5.21 +<input type="radio" name="VNCONLY" $([ "$VNCONLY" != "no" ] && echo "checked=checked ")value="yes"> keep VNC console only 5.22 </td> 5.23 </tr> 5.24 </table> 5.25 <p> 5.26 -<input type="checkbox" name="ASKFIRST" checked=checked /> 5.27 +<input type="checkbox" name="ASKFIRST" ${ASKFIRST:+checked=checked }/> 5.28 Confirm VNC console launch (spare some memory) 5.29 </p> 5.30 <p>
6.1 --- a/ftp-config/receipt Sat Feb 11 16:00:15 2017 +0100 6.2 +++ b/ftp-config/receipt Sun Feb 12 19:39:46 2017 +0100 6.3 @@ -18,10 +18,9 @@ 6.4 6.5 config_form() 6.6 { 6.7 - [ "$UPLOAD" == "on" ] && UPLOAD="ckecked=ckecked " || UPLOAD= 6.8 cat <<EOT 6.9 -FTP root <input type="text" name="ROOT" > 6.10 -allow upload <input type="checkbox" name="UPLOAD" $UPLOAD> 6.11 +FTP root <input type="text" name="ROOT" ${ROOT:+value="$ROOT" }> 6.12 +allow upload <input type="checkbox" name="UPLOAD" ${UPLOAD:+checked="checked" }> 6.13 EOT 6.14 } 6.15
7.1 --- a/gpxe/receipt Sat Feb 11 16:00:15 2017 +0100 7.2 +++ b/gpxe/receipt Sun Feb 12 19:39:46 2017 +0100 7.3 @@ -57,7 +57,8 @@ 7.4 cat <<EOT 7.5 Boot url list : 7.6 <textarea name="URLS" cols="60" rows="5" wrap="off"> 7.7 -$URLS 7.8 +${URLS:-$(dd if=$1/usr/share/boot/gpxe.pxe bs=1 skip=5 count=256 2>/dev/null | \ 7.9 + strings | sed s'/,/\n/g')} 7.10 </textarea> 7.11 EOT 7.12 }
8.1 --- a/hardware-ibm-6272/receipt Sat Feb 11 16:00:15 2017 +0100 8.2 +++ b/hardware-ibm-6272/receipt Sun Feb 12 19:39:46 2017 +0100 8.3 @@ -66,9 +66,9 @@ 8.4 <table> 8.5 <tr> 8.6 <td>Allowed IRQ for the Ethernet driver cs89x0</td> 8.7 -<td><input type="text" name="IRQ_CS89X0_LIST" value="${IRQ_LIST:-15 12 11 10 9 7 6 5 4 3}" /></td> 8.8 +<td><input type="text" name="IRQ_CS89X0_LIST" value="${IRQ_CS89X0_LIST:-15 12 11 10 9 7 6 5 4 3}" /></td> 8.9 </tr> 8.10 </table> 8.11 -<input type="checkbox" name="CS89X0_WIPEPNP" />Remove PNP binaries after use<br> 8.12 +<input type="checkbox" name="CS89X0_WIPEPNP" ${CS89X0_WIPEPNP:+checked="checked" }/>Remove PNP binaries after use<br> 8.13 EOT 8.14 }
9.1 --- a/keyboard/receipt Sat Feb 11 16:00:15 2017 +0100 9.2 +++ b/keyboard/receipt Sun Feb 12 19:39:46 2017 +0100 9.3 @@ -134,7 +134,7 @@ 9.4 </select></td> 9.5 </tr> 9.6 </table> 9.7 -<input type="checkbox" name="USECMDLINE" $([ "$USECMDLINE" == "on" ] && echo "checked=checked ")value="yes"> 9.8 +<input type="checkbox" name="USECMDLINE" ${USECMDLINE:+checked=checked }value="yes"> 9.9 Use the kernel command line arguments <b><i>kmap=</i></b>, 9.10 <b><i>lang=</i></b> and <b><i>tz=</i></b> (+200Kb). 9.11 EOT
10.1 --- a/lan-config/receipt Sat Feb 11 16:00:15 2017 +0100 10.2 +++ b/lan-config/receipt Sun Feb 12 19:39:46 2017 +0100 10.3 @@ -53,9 +53,11 @@ 10.4 10.5 config_form() 10.6 { 10.7 - [ -n "$INTERFACE" ] || INTERFACE=eth1 10.8 - [ -n "$IP" ] || IP=192.168.0.6 10.9 - [ -n "$NETMASK" ] || NETMASK=255.255.255.0 10.10 + if [ -z "$MODE" ]; then 10.11 + INTERFACE=eth1 10.12 + IP=192.168.0.6 10.13 + NETMASK=255.255.255.0 10.14 + fi 10.15 cat <<EOT 10.16 <table> 10.17 <tr> 10.18 @@ -78,7 +80,7 @@ 10.19 <td><input type="text" name="NETMASK" value="$NETMASK" /></td> 10.20 </tr> 10.21 </table> 10.22 -<input type="checkbox" name="ROUTING" value="ON" checked="checked" /> 10.23 +<input type="checkbox" name="ROUTING" ${ROUTING:+value="ON" checked="checked" }/> 10.24 Enable LAN routing<br> 10.25 EOT 10.26 }
11.1 --- a/lpd-config/receipt Sat Feb 11 16:00:15 2017 +0100 11.2 +++ b/lpd-config/receipt Sun Feb 12 19:39:46 2017 +0100 11.3 @@ -2,7 +2,7 @@ 11.4 11.5 PACKAGE="lpd-config" 11.6 VERSION="1.0" 11.7 -CATEGORY="system" 11.8 +CATEGORY="meta" 11.9 SHORT_DESC="Line printer server configuration (without spooling)" 11.10 MAINTAINER="pascal.bellard@slitaz.org" 11.11 LICENSE="BSD" 11.12 @@ -13,14 +13,14 @@ 11.13 # Rules to gen a SliTaz package suitable for Tazpkg. 11.14 genpkg_rules() 11.15 { 11.16 - mkdir -p $fs/var/spool $fs/dev 11.17 + mkdir -p $fs/var/spool 11.18 } 11.19 11.20 config_form() 11.21 { 11.22 cat <<EOT 11.23 Respective printer names for lp0, lp1 ... 11.24 -<input type="text" name="LP_NAMES" value="$LP_NAMES" > 11.25 +<input type="text" name="LP_NAMES" value="${LP_NAMES:-printer}" > 11.26 EOT 11.27 } 11.28
12.1 --- a/lpd-spooling-config/receipt Sat Feb 11 16:00:15 2017 +0100 12.2 +++ b/lpd-spooling-config/receipt Sun Feb 12 19:39:46 2017 +0100 12.3 @@ -21,7 +21,7 @@ 12.4 { 12.5 cat <<EOT 12.6 Respective printer names for lp0, lp1 ... 12.7 -<input type="text" name="LP_NAMES" value="$LP_NAMES" > 12.8 +<input type="text" name="LP_NAMES" value="${LP_NAMES:-printer}" > 12.9 EOT 12.10 } 12.11
13.1 --- a/module-3c509/receipt Sat Feb 11 16:00:15 2017 +0100 13.2 +++ b/module-3c509/receipt Sun Feb 12 19:39:46 2017 +0100 13.3 @@ -41,7 +41,7 @@ 13.4 <table> 13.5 <tr> 13.6 <td>IRQ</td> 13.7 -<td><input type="text" name="IRQ3C509" /></td> 13.8 +<td><input type="text" name="IRQ3C509" ${IRQ3C509:+value="$IRQ3C509" } /></td> 13.9 </tr> 13.10 <tr> 13.11 <td>Tranceiver</td>
14.1 --- a/module-cs89x0/receipt Sat Feb 11 16:00:15 2017 +0100 14.2 +++ b/module-cs89x0/receipt Sun Feb 12 19:39:46 2017 +0100 14.3 @@ -42,12 +42,12 @@ 14.4 <table> 14.5 <tr> 14.6 <td>I/O base</td> 14.7 -<td><input type="text" name="IOCS89" 14.8 +<td><input type="text" name="IOCS89" ${IOCS89:+value="$IOCS89" } 14.9 title="Likely 0x300 0x320 0x340 0x360 0x200 0x220 0x240 0x260 0x280 0x2a0 0x2c0 or 0x2e0" /></td> 14.10 </tr> 14.11 <tr> 14.12 <td>IRQ</td> 14.13 -<td><input type="text" name="IRQCS89" title "Likely 10 11 12 or 5" /></td> 14.14 +<td><input type="text" name="IRQCS89" title "Likely 10 11 12 or 5" ${IRQCS89:+value="$IRQCS89" }/></td> 14.15 </tr> 14.16 <tr> 14.17 <td>Media</td>
15.1 --- a/module-ne/receipt Sat Feb 11 16:00:15 2017 +0100 15.2 +++ b/module-ne/receipt Sun Feb 12 19:39:46 2017 +0100 15.3 @@ -37,20 +37,24 @@ 15.4 15.5 config_form() 15.6 { 15.7 + if [ -n "$IONE2K" ]; then 15.8 + IONE2K=0x300 15.9 + BADNE2K=on 15.10 + fi 15.11 cat <<EOT 15.12 <h4>NE2000 isa Ethernet driver</h4> 15.13 <table> 15.14 <tr> 15.15 <td>I/O base (required)</td> 15.16 -<td><input type="text" name="IONE2K" value="0x300" 15.17 +<td><input type="text" name="IONE2K" ${IONE2K:+value="$IONE2K"} 15.18 title="Likely 0x300 0x280 0x320 0x340 0x360 or 0x380" /></td> 15.19 </tr> 15.20 <tr> 15.21 <td>IRQ (optionnal)</td> 15.22 -<td><input type="text" name="IRQNE2K" /></td> 15.23 +<td><input type="text" name="IRQNE2K" ${IRQNE2K:+value="$IRQNE2K" }/></td> 15.24 </tr> 15.25 </table> 15.26 -<input type="checkbox" name="BADNE2K" value="ON" /> 15.27 +<input type="checkbox" name="BADNE2K" ${BADNE2K:+value="on" }/> 15.28 Accept card with bad signatures<br> 15.29 EOT 15.30 }
16.1 --- a/module-tlan/receipt Sat Feb 11 16:00:15 2017 +0100 16.2 +++ b/module-tlan/receipt Sun Feb 12 19:39:46 2017 +0100 16.3 @@ -34,6 +34,10 @@ 16.4 16.5 config_form() 16.6 { 16.7 + if [ -z "$SPEEDTLAN" ]; then 16.8 + AUITLAN=on 16.9 + BIGBUFTLAN=on 16.10 + fi 16.11 cat <<EOT 16.12 <h4>TI ThunderLAN based ethernet PCI adapter</h4> 16.13 <table> 16.14 @@ -54,9 +58,9 @@ 16.15 </select></td> 16.16 </tr> 16.17 </table> 16.18 -<input type="checkbox" name="AUITLAN" value="1" /> 16.19 +<input type="checkbox" name="AUITLAN" ${AUITLAN:+value="on" }/> 16.20 ThunderLAN use AUI port(s)<br> 16.21 -<input type="checkbox" name="BIGBUFTLAN" value="1" /> 16.22 +<input type="checkbox" name="BIGBUFTLAN" ${BIGBUFTLAN:+value="on" }/> 16.23 ThunderLAN use big buffer<br> 16.24 EOT 16.25 }
17.1 --- a/rsync/receipt Sat Feb 11 16:00:15 2017 +0100 17.2 +++ b/rsync/receipt Sun Feb 12 19:39:46 2017 +0100 17.3 @@ -48,23 +48,20 @@ 17.4 17.5 config_form() 17.6 { 17.7 - [ "$START" == "on" ] && START="ckecked=ckecked " || START= 17.8 - [ -n "$RSYNCD_CONF" ] || RSYNCD_CONF="$(cat $1/etc/rsyncd.conf)" 17.9 - [ -n "$RSYNCD_SECRETS" ] || RSYNCD_SECRETS="$(cat $1/etc/rsyncd.secrets)" 17.10 cat <<EOT 17.11 <p> 17.12 -<input type="checkbox" name="START" $START> start rsync daemon during boot 17.13 +<input type="checkbox" name="START" ${START:+ckecked=ckecked }> start rsync daemon during boot 17.14 </p> 17.15 <fieldset> 17.16 <legend><i>/etc/rsyncd.conf</i></legend> 17.17 <textarea name="RSYNCD_CONF" rows="15" cols="60" wrap="off"> 17.18 -$RSYNCD_CONF 17.19 +${RSYNCD_CONF:-$(cat $1/etc/rsyncd.conf)} 17.20 </textarea> 17.21 </fieldset> 17.22 <fieldset> 17.23 <legend><i>/etc/rsyncd.secrets</i></legend> 17.24 <textarea name="RSYNCD_SECRETS" cols="60" wrap="off"> 17.25 -$RSYNCD_SECRETS 17.26 +${RSYNCD_SECRETS:-$(cat $1/etc/rsyncd.secrets)} 17.27 </textarea> 17.28 </fieldset> 17.29 <fieldset>
18.1 --- a/wiki/receipt Sat Feb 11 16:00:15 2017 +0100 18.2 +++ b/wiki/receipt Sun Feb 12 19:39:46 2017 +0100 18.3 @@ -45,14 +45,12 @@ 18.4 18.5 config_form() 18.6 { 18.7 - [ -n "$WIKI_PASSWORD" ] || WIKI_PASSWORD=test 18.8 cat <<EOT 18.9 <table> 18.10 <tr> 18.11 <td>Wiki password</td> 18.12 -<td><input type="text" name="WIKI_PASSWORD" value="$WIKI_PASSWORD" /></td> 18.13 +<td><input type="text" name="WIKI_PASSWORD" value="${WIKI_PASSWORD:-test}" /></td> 18.14 </tr> 18.15 </table> 18.16 EOT 18.17 } 18.18 -