--- lib/PXElator/httpd.pm	2009/07/30 22:55:08	71
+++ lib/PXElator/httpd.pm	2009/07/31 17:41:19	86
@@ -97,8 +97,10 @@
 	warn "start_stop $daemon $pid pids: ",dump( $pids );
 
 	if ( $pid =~ m{^\d+$} ) {
-		warn "kill 9 $pid";
-		kill 9, $pid;
+		my $pstree = `pstree -p $pid`;
+		my @pids = $pstree =~ m{\((\d+)\)}g;
+		warn "pstree $pstree pids ",dump( @pids );
+		kill 1, $_ foreach reverse @pids;
 		$pids->{$daemon} = 'stopped';
 		return qq|$daemon pid $pid stopped|;
 	} else {
@@ -109,7 +111,9 @@
 			return qq|$daemon pid $pid started|;
 		} elsif ( defined $pid ) {
 			# child
-			my $eval = $daemon . '::start(' . ( @_ ? dump(@_) : '' ) . ')';
+			my $invoke = 'start';
+			$invoke = $1 if $daemon =~ s{/(.+)}{};
+			my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')';
 			warn "eval $eval";
 			eval $eval;
 			warn "can't start $daemon: $@" if $@;
@@ -145,27 +149,34 @@
 
 		my $debug_proc;
 
-		warn 'pids: ', dump( $pids );
+		warn 'pids: ', dump( $pids ) if $debug;
 		foreach my $name ( keys %$pids ) {
 			my $pid = $pids->{$name} || next;
 
 			my $html = qq|<a href=/$name>$pid</a>|;
 
-			if ( $debug ) {
-				$html .= qq| <a name=$pid href=#proc-$pid>?</a>|;
+			my $proc = "/proc/$pid/status";
 
-				my $proc = "/proc/$pid/status";
-				$debug_proc
-					.= qq|<a name=proc-$pid href=#$pid>$proc</a><pre style="font-size: 10%">|
-					.  read_file($proc)
-					.  qq|</pre>|
-					if -e $proc;
+			if ( -e $proc ) {
+				if ( $debug ) {
+					$html .= qq| <a name=$pid href=#proc-$pid>?</a>|;
+
+					$debug_proc
+						.= qq|<a name=proc-$pid href=#$pid>$proc</a><pre style="font-size: 10%">|
+						.  read_file($proc)
+						.  qq|</pre>|
+						;
+				}
+
+				if ( $name->can('start_options') ) {
+					$html .= qq| <a href=/kvm/$_>$_</a>| foreach $name->start_options;
+				}
 			}
 
 			push @rows, ( $name => $html );
 		}
 
-		warn 'static_pids: ', dump( $static_pids );
+		warn 'static_pids: ', dump( $static_pids ) if $debug;
 		foreach my $pid ( keys %$static_pids ) {
 			my $path = $static_pids->{$pid};
 			if ( -d "/proc/$pid" ) {
@@ -175,18 +186,22 @@
 			}
 		}
 
-		print $client $ok, html::table( 2, @rows ), $debug_proc;
+		print $client $ok
+			, html::table( 2, @rows )
+			, html::tabs( log::mac_changes )
+			, $debug_proc
+			;
 
 	} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
 		eval 'our $' . $1 . ' = ' . $2;
 		warn $@ if $@;
 		print $client $redirect, qq|<big>$1 = $2</big><br>Location: <a href="$url">$url</a>|;
 		server::debug( $debug ) if $1 eq 'debug';
-	} elsif ( $path =~ m{^/(screen|kvm)} ) {
+	} elsif ( $path =~ m{^/((?:screen|kvm).*)} ) {
 		print $client $redirect, start_stop($1);
 	} elsif ( $path =~ m{^/kill/static/(\d+)} ) {
 		print $client $redirect;
-		kill 9, $1 && warn "killed $1";
+		kill 1, $1 || kill 9, $2 && warn "killed $1";
  	} elsif ( $path eq '/exit' ) {
 #		DESTROY;
 		exit 0;