Attachment 617838 Details for Bug 643302 – allow conf.d files to include directories

[patch] allow conf.d files to include directories

tgtd-include-dirs.patch (text/plain), 1.08 KB, created by Pádraig Brady on 2012-09-26 23:26:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pádraig Brady

Created: 2012-09-26 23:26:48 UTC

Size: 1.08 KB

patch

obsolete

>--- tgt-admin.old	2012-09-26 23:15:24.544264517 +0100
>+++ /usr/sbin/tgt-admin	2012-09-26 23:07:10.489057377 +0100
>@@ -162,7 +162,7 @@
> 		# Check if alternative configuration file exists
> 		if (-e "$alternate_conf") {
> 			execute("# Using $alternate_conf as configuration file\n");
>-			%conf = ParseConfig(-ConfigFile => "$alternate_conf", -UseApacheInclude => 1, -IncludeGlob => 1, -MergeDuplicateBlocks => 1);
>+			%conf = ParseConfig(-ConfigFile => "$alternate_conf", -UseApacheInclude => 1, -IncludeDirectories => 1, -IncludeGlob => 1, -MergeDuplicateBlocks => 1);
> 		}
> 		else {
> 			die("Config file $alternate_conf not found. Exiting...\n");
>@@ -170,7 +170,7 @@
> 	} else {
> 		# Parse the config file with Config::General
> 		if (-e "$configfile") {
>-			%conf = ParseConfig(-ConfigFile => "$configfile", -UseApacheInclude => 1, -IncludeGlob => 1, -MergeDuplicateBlocks => 1);
>+			%conf = ParseConfig(-ConfigFile => "$configfile", -UseApacheInclude => 1, -IncludeDirectories => 1, -IncludeGlob => 1, -MergeDuplicateBlocks => 1);
> 		} else {
> 			die("Config file $configfile not found. Exiting...\n");
> 		}

Actions: View | Diff

Attachments on bug 643302: 453673 | 453675 | 453677 | 617838 | 639693 | 640036