b2ac137617
- Convert old style rc script to new style PR: ports/119296 Submitted by: valerio.daelli at gmail.com (maintainer)
29 lines
1.1 KiB
Text
29 lines
1.1 KiB
Text
--- netdisco.orig Wed Mar 7 10:09:23 2007
|
|
+++ netdisco Wed Mar 7 10:18:23 2007
|
|
@@ -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') {
|
|
if (defined $c and -r $c){
|
|
$configfile = $c;
|
|
print "Using Config File : $configfile\n" if $DEBUG;
|
|
@@ -629,7 +629,7 @@
|
|
|
|
my ($file_name,$want_time,$no_header) = @_;
|
|
|
|
- my $file_path = homepath('datadir','data');
|
|
+ my $file_path = homepath('datadir','%%DBDIR%%/netdisco');
|
|
|
|
my $extension = defined $CONFIG{logextension} ? $CONFIG{logextension} : 'log';
|
|
|
|
@@ -3597,7 +3597,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');
|
|
|
|
if (defined $pid) {
|
|
print "Writing pid:$pid to $pid_file\n" if $DEBUG;
|