--- lib/PXElator/daemons.pm	2009/08/16 21:27:15	227
+++ lib/PXElator/daemons.pm	2009/09/07 21:34:05	390
@@ -32,13 +32,19 @@
 	CouchDB::audit( $msg, $daemon, { daemon => $daemon, message => $msg, @_ } );
 }
 
+mkdir "$server::conf/pid" unless -d "$server::conf/pid";
+
 sub start_stop {
-	my $daemon = shift;
+	my ($daemon,$param) = @_;
+
+	$daemon .= '.' . $param->{nr} if defined $param->{nr}; # XXX nr for kvm
 
 	my $pid = $pids->{$daemon};
-	my $pid_path = "$daemon.pid";
+	my $pid_path = $daemon;
 	$pid_path =~ s{/}{-}g;
-	$pid_path = "$server::conf/$pid_path";
+	$pid_path = "$server::conf/pid/$pid_path";
+
+	warn "# start_stop $daemon ",dump( $param );
 
 	if ( ! $pid && -e $pid_path ) {
 		my $p = read_file $pid_path;
@@ -54,7 +60,7 @@
 	$pid ||= 'not started';
 	warn "start_stop $daemon $pid\n";
 
-	if ( $pid =~ m{^\d+$} ) {
+	if ( $pid =~ m{^\d+$} && kill 0, $pid ) {
 		my $pstree = `pstree -p $pid`;
 		my @pids = $pstree =~ m{\((\d+)\)}g;
 		warn "pstree $pstree pids ",dump( @pids );
@@ -70,22 +76,31 @@
 		audit 'stopped', $daemon, pid => $pid;
 		return qq|$daemon pid $pid stopped|;
 	} else {
+
+		$ENV{$_} = $param->{$_} foreach keys %$param;
+
 		if ( $pid = fork ) {
 			# parent
 			$pids->{$daemon} = $pid;
 			write_file $pid_path, $pid;
 			audit 'forked', $daemon, pid => $pid;
+
+			delete $ENV{$_} foreach keys %$param; # cleanup enviroment
+
 			return qq|$daemon pid $pid started|;
 		} elsif ( defined $pid ) {
 			# child
 			my $invoke = 'start';
 			$invoke = $1 if $daemon =~ s{/(.+)}{};
-			if ( $daemon =~ m{dhcpd|tftpd|dnsd} ) {
+warn "XXX child ",dump( %ENV );
+			if ( $daemon =~ m{dhcpd|tftpd|dnsd|syslogd} ) {
 				my $exec = "perl -I$server::base_dir/lib -I$server::base_dir/lib/PXElator -M$daemon -e ${daemon}::${invoke}";
 				audit 'exec', $daemon, 'exec' => $exec;
 				x11::xterm( $daemon => $exec );
 			} else {
-				my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')';
+				$daemon =~ s{\.\d+$}{} if defined $ENV{nr};
+warn "XXXX $daemon\n";
+				my $eval = $daemon . '::' . $invoke . '(' . dump( $param ) . ')';
 				audit 'eval', $daemon, 'eval' => $eval;
 				eval $eval;
 				audit 'error', $daemon, error => $@  if $@;