From 49cf4482ea952de6bcf3c023c017309cd7926c15 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <asulfrian@zedat.fu-berlin.de>
Date: Sat, 29 Jan 2022 19:59:03 +0100
Subject: debconf: Add ability to ignore conf settings

---
 schemas/types.xsd                     | 9 +++++++++
 src/lib/Bcfg2/Client/Tools/Debconf.py | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/schemas/types.xsd b/schemas/types.xsd
index fc2e7bdc4..dc57c5cc8 100644
--- a/schemas/types.xsd
+++ b/schemas/types.xsd
@@ -570,6 +570,15 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attribute type="xsd:boolean" name="ignore" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+          If you set this to "true" the configuration setting will be ignored
+          and not updated. This is usefull to remove a setting from the list of
+          extra entries.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 </xsd:schema>
diff --git a/src/lib/Bcfg2/Client/Tools/Debconf.py b/src/lib/Bcfg2/Client/Tools/Debconf.py
index 0d286028b..706f7a8dc 100644
--- a/src/lib/Bcfg2/Client/Tools/Debconf.py
+++ b/src/lib/Bcfg2/Client/Tools/Debconf.py
@@ -68,6 +68,9 @@ class Debconf(Bcfg2.Client.Tools.Tool):
 
     def VerifyConf(self, entry, _modlist):
         """ Verify the given Debconf entry. """
+        if entry.get('ignore', 'false').lower() == 'true':
+            return True
+
         (_, current_value) = self.debconf_get(entry.get('name'))
         entry.set('current_value', current_value)
         return current_value == entry.get('value')
-- 
cgit v1.2.3-1-g7c22