# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1447592583 -3600
# Node ID b8613f5d5f32d4ea69c319a2b0b1225fb76b5989
# Parent  6226c660c4b670190cc38ec81597eb96656e6536
index.cgi: add ionice support

diff -r 6226c660c4b6 -r b8613f5d5f32 index.cgi
--- a/index.cgi	Fri Nov 13 10:38:19 2015 +0100
+++ b/index.cgi	Sun Nov 15 14:03:03 2015 +0100
@@ -465,6 +465,7 @@
 		[ -n "$r" ] && echo "<meta http-equiv=\"refresh\" content=\"$r\">"
 
 		[ "$(GET renice)" ] && renice $(GET renice)
+		[ "$(GET ionice)" ] && ionice $(GET ionice)
 		[ "$(GET kill)" ] && kill $(GET kill)
 		if [ "$(GET pid)" ] && [ -d /proc/$(GET pid)/ ]; then
 			curpid=$(GET pid)
@@ -486,18 +487,43 @@
 	<p>$(_ 'Start time:')
 		$starttime
 	</p>
-	<p>$(_ 'Renice')[$curnice]
+	<p>$(_ 'Renice')
 	<input type="hidden" name="top"/>
+	<select name "renice" onchange="this.form.submit()">
 EOT
-			values="+19 +15 +10 +5 +3 +1 0 -1 -3 -5 -10 -15 -19"
-			[ $(id -u) -eq 0 ] || values="+19 +15 +10 +5 +3 +1"
+			values="$(seq 20 -1 -20)"
+			[ $(id -u) -eq 0 ] || values="$(seq 20 -1 0)"
 			for i in $values ; do
 				cat <<EOT
-	<input type="radio" name="renice" value="$i $curpid" $([ $curnice -eq $i ] && echo checked) onchange="this.form.submit()"/>
-	<label>$i</label>
+	<option value="$i $curpid" $([ $curnice -eq $i ] && echo selected)>$(printf "%+d" $i)</option>
 EOT
 			done
 			cat <<EOT
+	</select>
+	$(_ 'I/O class')
+	<select name="ionice" onchange="this.form.submit()">
+EOT
+			while read class name max; do
+				if [ "$max" ]; then
+					[ $(id -u) -ne 0 ] && continue
+					for i in $(seq 0 $max); do
+						selected="selected"
+						[ "$(ionice $curpid)" = "$name: prio $i" ] || selected=""
+						echo "		<option value=\"-c $class -n $i -p $curpid\" $selected>$name: prio $i</option>"
+					done
+				else
+					selected="selected"
+					[ "$(ionice $curpid)" = "$name" ] || selected=""
+					echo "		<option value=\"-c $class -p $curpid\" $selected>$name</option>"
+				fi
+			done <<EOT
+0	none
+1	realtime	7
+2	best-effort	7
+3	idle
+EOT
+			cat <<EOT
+	</select>
 	</p>
 </form>
 </section>
diff -r 6226c660c4b6 -r b8613f5d5f32 tazpanel
--- a/tazpanel	Fri Nov 13 10:38:19 2015 +0100
+++ b/tazpanel	Sun Nov 15 14:03:03 2015 +0100
@@ -58,7 +58,7 @@
 		_n 'Starting TazPanel web server on port %d...' $HTTPD_PORT
 		$DAEMON -p $HTTPD_PORT -u root -c $HTTPD_CONF \
 			-r "$(_ 'TazPanel Authentication - Default: root:root')" &
-		ps | grep "httpd -p $HTTPD_PORT " | grep -v grep | \
+		ps | grep "$DAEMON -p $HTTPD_PORT " | grep -v grep | \
 			awk '{ print $1 }' > $PIDFILE
 		[ ! -f /var/lib/tazpkg/installed.info ] && tazpkg -l>/dev/null&
 		status ;;