# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1303038649 -7200
# Node ID a758062d41a628f55c20769a3753676de96e190b
# Parent  0a8644c1f8a83d5e39208a1fdfdb2d1e3154bc6c
boot.cgi: show daemon process

diff -r 0a8644c1f8a8 -r a758062d41a6 boot.cgi
--- a/boot.cgi	Sun Apr 17 12:20:08 2011 +0200
+++ b/boot.cgi	Sun Apr 17 13:10:49 2011 +0200
@@ -56,14 +56,6 @@
 		#
 		# Start and stop a daemon. I think we dont need restart since 2 
 		# clicks and you are done
-		daemon=$(GET daemons)
-		case "$daemon" in
-			start=*)
-				sleep 1
-				/etc/init.d/${daemon#start=} start | log ;;
-			stop=*)
-				/etc/init.d/${daemon#stop=} stop | log ;;
-		esac
 		. /etc/rcS.conf
 		xhtml_header
 		
@@ -75,6 +67,18 @@
 	</p>
 </div>
 EOT
+		daemon=$(GET daemons)
+		case "$daemon" in
+			start=*)
+				sleep 1
+				/etc/init.d/${daemon#start=} start | log ;;
+			stop=*)
+				/etc/init.d/${daemon#stop=} stop | log ;;
+			pid=*)
+				echo "<pre>"
+				ps ww | sed "1p;/^ *${daemon#pid=} /!d"
+				echo "</pre>" ;;
+		esac
 		# Demon list
 		table_start
 		cat << EOT
@@ -148,17 +152,26 @@
 			# Pidof works for many daemon
 			[ "$pid" ] || pid=`pidof $name`
 			if [ "$pid" ]; then
-				echo "<td><img src='$IMAGES/started.png' /></td>"
-				echo "<td><a href='$SCRIPT_NAME?daemons=stop=$name'>
-				<img src='$IMAGES/stop.png' /></a></td>"
-				echo "<td>$pid</td>"
+				cat << EOT
+<td><img src="$IMAGES/started.png" /></td>
+<td><a href="$SCRIPT_NAME?daemons=stop=$name">
+    <img src="$IMAGES/stop.png" /></a></td>
+<td>
+EOT
+				for i in $pid; do
+					cat << EOT
+<a href="$SCRIPT_NAME?daemons=pid=$i">$i</a>
+EOT
+				done
 			else
-				echo "<td>-</td>"
-				echo "<td><a href='$SCRIPT_NAME?daemons=start=$name'>
-					<img src='$IMAGES/start.png' /></a></td>"
-				echo "<td>-----</td>"
+				cat << EOT
+<td>-</td>
+<td><a href="$SCRIPT_NAME?daemons=start=$name">
+    <img src="$IMAGES/start.png" /></a></td>
+<td>-----
+EOT
 			fi
-			echo '</tr>'
+			echo '</td></tr>'
 		done
 		table_end ;;
 	*)