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

8
Netdisco/Changes
View File

@@ -1,4 +1,10 @@
2.027003 - 2014-05-04 2.027004 - 2014-05-15
[BUG FIXES]
* fix bug in call to Daemon::Contol redirect_filehandles (M. Planck)
2.027003 - 2014-05-14
[BUG FIXES] [BUG FIXES]

2
Netdisco/META.yml
View File

@@ -78,4 +78,4 @@ resources:
homepage: http://netdisco.org/ homepage: http://netdisco.org/
license: http://opensource.org/licenses/bsd-license.php license: http://opensource.org/licenses/bsd-license.php
repository: git://git.code.sf.net/p/netdisco/netdisco-ng repository: git://git.code.sf.net/p/netdisco/netdisco-ng
version: 2.027003 version: 2.027004

2
Netdisco/bin/netdisco-daemon
View File

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

2
Netdisco/bin/netdisco-web
View File

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

2
Netdisco/lib/App/Netdisco.pm
View File

@@ -4,7 +4,7 @@ use strict;
use warnings; use warnings;
use 5.010_000; use 5.010_000;
our $VERSION = '2.027003'; our $VERSION = '2.027004';
use App::Netdisco::Configuration; use App::Netdisco::Configuration;
=head1 NAME =head1 NAME