ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1385 from ZoneMinder/remove_local_zm_conf_override 

Remove the code looks for zm.conf in the current dir.
This commit is contained in:
Andrew Bauer 2016-04-04 20:29:50 -05:00
parent 711343a5cc a31660c1f6
commit 1ff84cf94a
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
View File

@ -66,12 +66,6 @@ use Carp;
BEGIN
{
my $config_file = ZM_CONFIG;
( my $local_config_file = $config_file ) =~ s|^.*/|./|;
if ( -s $local_config_file and -r $local_config_file )
{
print( STDERR "Warning, overriding installed $local_config_file file with local copy\n" );
$config_file = $local_config_file;
}
open( my $CONFIG, "<", $config_file )
or croak( "Can't open config file '$config_file': $!" );
foreach my $str ( <$CONFIG> )