diff options
Diffstat (limited to 'net-mgmt/netdisco/files/patch-netdisco')
| -rw-r--r-- | net-mgmt/netdisco/files/patch-netdisco | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net-mgmt/netdisco/files/patch-netdisco b/net-mgmt/netdisco/files/patch-netdisco index 4d8e9a745724..655546cc7149 100644 --- a/net-mgmt/netdisco/files/patch-netdisco +++ b/net-mgmt/netdisco/files/patch-netdisco @@ -1,15 +1,15 @@ ---- netdisco.orig Wed Mar 7 10:09:23 2007 -+++ netdisco Wed Mar 7 10:18:23 2007 +--- netdisco.orig 2010-07-04 01:51:44.000000000 +0100 ++++ netdisco 2010-07-04 01:55:59.000000000 +0100 @@ -113,7 +113,7 @@ &header if (grep(/^([aABdeEFgIikKmMOprRTu]|expire-nodes-subnet)$/,keys %args) and !$BatchMode); # Parse Config File - Check for -C, then in current dir, then in default dir. -foreach my $c ($args{C},"$FindBin::Bin/netdisco.conf",'/usr/local/netdisco/netdisco.conf') { -+foreach my $c ($args{C},"$FindBin::Bin/netdisco.conf",'%%PREFIX%%/etc/netdisco/netdisco.conf') { ++foreach my $c ($args{C},"$FindBin::Bin/netdisco.conf",'%%ETCDIR%%/netdisco.conf') { if (defined $c and -r $c){ $configfile = $c; print "Using Config File : $configfile\n" if $DEBUG; -@@ -629,7 +629,7 @@ +@@ -683,7 +683,7 @@ my ($file_name,$want_time,$no_header) = @_; @@ -18,12 +18,12 @@ my $extension = defined $CONFIG{logextension} ? $CONFIG{logextension} : 'log'; -@@ -3597,7 +3597,7 @@ +@@ -4471,7 +4471,7 @@ sub admin_daemon_pid { my $pid = shift; - my $pid_file = homepath('daemon_pid', 'netdisco_daemon.pid'); -+ my $pid_file = homepath('daemon_pid','%%RUNDIR%%/netdisco_daemon.pid'); ++ my $pid_file = homepath('daemon_pid', '%%RUNDIR%%/netdisco_daemon.pid'); if (defined $pid) { print "Writing pid:$pid to $pid_file\n" if $DEBUG; |