#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.0.0beta0, released 11 Jul 2006.
#
# See http://backuppc.sourceforge.net.
#
return "$s->{ConfDir}/config.pl" if ( !defined($host) );
if ( $s->{useFHS} ) {
- return "$s->{ConfDir}/host/$host.pl";
+ return "$s->{ConfDir}/pc/$host.pl";
} else {
+ return "$s->{TopDir}/pc/$host/config.pl"
+ if ( -f "$s->{TopDir}/pc/$host/config.pl" );
return "$s->{ConfDir}/$host.pl"
if ( $host ne "config" && -f "$s->{ConfDir}/$host.pl" );
- return "$s->{TopDir}/pc/$host/config.pl";
+ return "$s->{ConfDir}/pc/$host.pl";
}
}
$conf->{$param} = { "*" => $conf->{$param} };
}
+ #
+ # Handle backward compatibility with defunct BlackoutHourBegin,
+ # BlackoutHourEnd, and BlackoutWeekDays parameters.
+ #
+ if ( defined($conf->{BlackoutHourBegin}) ) {
+ push(@{$conf->{BlackoutPeriods}},
+ {
+ hourBegin => $conf->{BlackoutHourBegin},
+ hourEnd => $conf->{BlackoutHourEnd},
+ weekDays => $conf->{BlackoutWeekDays},
+ }
+ );
+ delete($conf->{BlackoutHourBegin});
+ delete($conf->{BlackoutHourEnd});
+ delete($conf->{BlackoutWeekDays});
+ }
+
return (undef, $conf);
}