From a31660c1f6d8e8e32fc6ea6ac43eaf88756f5c31 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 4 Apr 2016 10:45:58 -0400 Subject: [PATCH] Remove the code looks for zm.conf in the current dir. --- scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in index 0c5a82a30..3a226cdc8 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in +++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in @@ -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> )