tazpanel rev 550

tazpanel: do not start apache httpd (thanks llev)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Nov 13 10:38:19 2015 +0100 (2015-11-13)
parents 9f014dbbbcf8
children b8613f5d5f32
files floppy.cgi tazpanel
line diff
     1.1 --- a/floppy.cgi	Thu Nov 12 09:00:08 2015 +0100
     1.2 +++ b/floppy.cgi	Fri Nov 13 10:38:19 2015 +0100
     1.3 @@ -132,6 +132,10 @@
     1.4  </table>
     1.5  </section>
     1.6  EOT
     1.7 +case "$HOME" in
     1.8 +/home/*)	OUTPUTDIR=$HOME ;;
     1.9 +*)		OUTPUTDIR=/tmp ;;
    1.10 +esac
    1.11  cat <<EOT
    1.12  <section>
    1.13  	<header>
    1.14 @@ -157,7 +161,7 @@
    1.15  	</tr>
    1.16  	<tr>
    1.17  	<td>$(_ 'Default cmdline:')</td>
    1.18 -	<td id="cmdline"><input name="cmdline" size="36" type="text"> <input name="edit" checked="checked" type="checkbox">$(_ 'edit')
    1.19 +	<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')
    1.20  	<i>$(_ 'optional')</i></td>
    1.21  	</tr>
    1.22  	<tr>
    1.23 @@ -277,7 +281,7 @@
    1.24  	</tr>
    1.25  	<tr>
    1.26  	<td>$(_ 'Output directory:')</td>
    1.27 -	<td id="workdir"><input name="workdir" size="36" type="text" value="/tmp"></td>
    1.28 +	<td id="workdir"><input name="workdir" size="36" type="text" value="$OUTPUTDIR"></td>
    1.29  	</tr>
    1.30  	<tr>
    1.31  	<td>$(_ 'Floppy size:')</td>
     2.1 --- a/tazpanel	Thu Nov 12 09:00:08 2015 +0100
     2.2 +++ b/tazpanel	Fri Nov 13 10:38:19 2015 +0100
     2.3 @@ -56,7 +56,7 @@
     2.4  			exit 1
     2.5  		fi
     2.6  		_n 'Starting TazPanel web server on port %d...' $HTTPD_PORT
     2.7 -		httpd -p $HTTPD_PORT -u root -c $HTTPD_CONF \
     2.8 +		$DAEMON -p $HTTPD_PORT -u root -c $HTTPD_CONF \
     2.9  			-r "$(_ 'TazPanel Authentication - Default: root:root')" &
    2.10  		ps | grep "httpd -p $HTTPD_PORT " | grep -v grep | \
    2.11  			awk '{ print $1 }' > $PIDFILE