tazpanel rev 455
boot.cgi/mine: cd workdir
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Apr 12 12:33:26 2015 +0200 (2015-04-12) |
parents | fe835f4674eb |
children | 864a144f1b14 |
files | boot.cgi |
line diff
1.1 --- a/boot.cgi Sat Apr 11 17:30:12 2015 +0200 1.2 +++ b/boot.cgi Sun Apr 12 12:33:26 2015 +0200 1.3 @@ -381,10 +381,11 @@ 1.4 install*) dev=$(POST instdev) ;; 1.5 *) dev=$(POST usbkeydev) ;; 1.6 esac 1.7 + cd $workdir 1.8 cat <<EOT 1.9 <section> 1.10 <pre> 1.11 -$(taziso $iso $action $dev) 1.12 +$(taziso $iso $action $dev 2>&1) 1.13 </pre> 1.14 </section> 1.15 EOT 1.16 @@ -405,7 +406,7 @@ 1.17 <p> 1.18 Windows partition 1.19 <select name="instdev"> 1.20 - <option value="/dev/null">Choose a partition</option> 1.21 + <option value="/dev/null">Choose a partition (optional)</option> 1.22 EOT 1.23 blkid | grep -iE "(msdos|vfat|ntfs)" | \ 1.24 sed 's|^/dev/\(.*\):.*LABEL="\([^"]*\).*|\1 "\2"|' | \ 1.25 @@ -419,7 +420,7 @@ 1.26 <p> 1.27 USB key device 1.28 <select name="usbkeydev"> 1.29 - <option value="/dev/null">Choose an USB key</option> 1.30 + <option value="/dev/null">Choose a USB key (optional)</option> 1.31 EOT 1.32 grep -l 1 /sys/block/*/removable | \ 1.33 sed 's|/sys/block/\(.*\)/removable|\1|' | while read dev; do