# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1428834806 -7200
# Node ID 1bc6783d2671466f8acfccde0f550cc48daf330b
# Parent  fe835f4674ebfaa8068c7d62fa46c12be63eeab2
boot.cgi/mine: cd workdir

diff -r fe835f4674eb -r 1bc6783d2671 boot.cgi
--- a/boot.cgi	Sat Apr 11 17:30:12 2015 +0200
+++ b/boot.cgi	Sun Apr 12 12:33:26 2015 +0200
@@ -381,10 +381,11 @@
 			install*) dev=$(POST instdev) ;;
 			*) dev=$(POST usbkeydev) ;;
 			esac
+			cd $workdir
 			cat <<EOT
 <section>
 <pre>
-$(taziso $iso $action $dev)
+$(taziso $iso $action $dev 2>&1)
 </pre>
 </section>
 EOT
@@ -405,7 +406,7 @@
 <p>
 Windows partition
 <select name="instdev">
-	<option value="/dev/null">Choose a partition</option>
+	<option value="/dev/null">Choose a partition (optional)</option>
 EOT
 		blkid | grep -iE "(msdos|vfat|ntfs)" | \
 		sed 's|^/dev/\(.*\):.*LABEL="\([^"]*\).*|\1 "\2"|' | \
@@ -419,7 +420,7 @@
 <p>
 USB key device
 <select name="usbkeydev">
-	<option value="/dev/null">Choose an USB key</option>
+	<option value="/dev/null">Choose a USB key (optional)</option>
 EOT
 		grep -l 1 /sys/block/*/removable | \
 		sed 's|/sys/block/\(.*\)/removable|\1|' | while read dev; do