# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1447407499 -3600
# Node ID 6226c660c4b670190cc38ec81597eb96656e6536
# Parent  9f014dbbbcf8aa80ccbbb19a4ea99a1250656a56
tazpanel: do not start apache httpd (thanks llev)

diff -r 9f014dbbbcf8 -r 6226c660c4b6 floppy.cgi
--- a/floppy.cgi	Thu Nov 12 09:00:08 2015 +0100
+++ b/floppy.cgi	Fri Nov 13 10:38:19 2015 +0100
@@ -132,6 +132,10 @@
 </table>
 </section>
 EOT
+case "$HOME" in
+/home/*)	OUTPUTDIR=$HOME ;;
+*)		OUTPUTDIR=/tmp ;;
+esac
 cat <<EOT
 <section>
 	<header>
@@ -157,7 +161,7 @@
 	</tr>
 	<tr>
 	<td>$(_ 'Default cmdline:')</td>
-	<td id="cmdline"><input name="cmdline" size="36" type="text"> <input name="edit" checked="checked" type="checkbox">$(_ 'edit')
+	<td id="cmdline"><input name="cmdline" size="36" type="text" value="$(sed 's/^BOOT_IMAGE[^ ]* //;s/initrd=[^ ]* //' /proc/cmdline)" > <input name="edit" checked="checked" type="checkbox">$(_ 'edit')
 	<i>$(_ 'optional')</i></td>
 	</tr>
 	<tr>
@@ -277,7 +281,7 @@
 	</tr>
 	<tr>
 	<td>$(_ 'Output directory:')</td>
-	<td id="workdir"><input name="workdir" size="36" type="text" value="/tmp"></td>
+	<td id="workdir"><input name="workdir" size="36" type="text" value="$OUTPUTDIR"></td>
 	</tr>
 	<tr>
 	<td>$(_ 'Floppy size:')</td>
diff -r 9f014dbbbcf8 -r 6226c660c4b6 tazpanel
--- a/tazpanel	Thu Nov 12 09:00:08 2015 +0100
+++ b/tazpanel	Fri Nov 13 10:38:19 2015 +0100
@@ -56,7 +56,7 @@
 			exit 1
 		fi
 		_n 'Starting TazPanel web server on port %d...' $HTTPD_PORT
-		httpd -p $HTTPD_PORT -u root -c $HTTPD_CONF \
+		$DAEMON -p $HTTPD_PORT -u root -c $HTTPD_CONF \
 			-r "$(_ 'TazPanel Authentication - Default: root:root')" &
 		ps | grep "httpd -p $HTTPD_PORT " | grep -v grep | \
 			awk '{ print $1 }' > $PIDFILE