135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into og-pluggable-daemon

Browse Source 
Conflicts:
	Netdisco/lib/App/Netdisco.pm
This commit is contained in:
Oliver Gorwits
2014-05-17 22:20:40 +01:00
parent e80c575c57 ee398fcae8
commit 0a90308ecf
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netdisco/bin/netdisco-daemon
View File

@@ -104,7 +104,7 @@ sub fork_and_start {
die "Can't fork: $!" unless defined $pid;
if ($pid == 0) { # child
$daemon->redirect_filehandles();
$daemon->redirect_filehandles;
exec( $netdisco->stringify, @daemon_args );
}
else {

2
Netdisco/bin/netdisco-web
View File

@@ -107,7 +107,7 @@ sub fork_and_start {
die "Can't fork: $!" unless defined $pid;
if ($pid == 0) { # child
$daemon->redirect_filehandles();
$daemon->redirect_filehandles;
exec( 'starman', @starman_args );
}
else {