From: Nigel McNie <nigel@catalyst.net.nz>
Date: Wed, 16 May 2007 01:57:26 +0000 (+1200)
Subject: Make sure that, after we have encounted a 'no' for an inherit option, to set it back... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c96cfd4c9609c02308c96d8f20950fd671ad24df;p=vserverctl.git

Make sure that, after we have encounted a 'no' for an inherit option, to set it back to 'yes' for any children to turn off. That way profiles can always assume the default is 'yes' unless they turn it off.
---

diff --git a/vserverctl b/vserverctl
index 6f2a194..0f94337 100755
--- a/vserverctl
+++ b/vserverctl
@@ -211,6 +211,8 @@ sub readConfig { # {{{
             }
             else {
                 $generatedConfig->{files}{$key} = '';
+                # Re-default back to 'yes' for any children
+                $generatedConfig->{$inheritKey} = 1;
             }
 
             my $filename = $profileBaseDir . $cfg->{name} . '/' . $key;