From: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri, 2 Feb 2018 14:39:13 +0000 (+0100)
Subject: Disable default kpartx udev rule
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4999970bbdafaa82d0baa4dc6b8c0901c82214d0;p=mirror%2Fdsa-puppet.git

Disable default kpartx udev rule

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/debian_org/lib/facter/paths.rb b/modules/debian_org/lib/facter/paths.rb
index 49b57d6ec..ee6afbce2 100644
--- a/modules/debian_org/lib/facter/paths.rb
+++ b/modules/debian_org/lib/facter/paths.rb
@@ -13,8 +13,9 @@
    /srv/mirrors/public-debian-ports
    /srv/mirrors/public-debian-security
    /dev/hwrng
+   /lib/udev/rules.d/60-kpartx.rules
 }.each do |path|
-	Facter.add("has" + path.gsub(/[\/-]/,'_')) do
+	Facter.add("has" + path.gsub(/[\/.-]/,'_')) do
 		setcode do
 			if FileTest.exist?(path)
 				true
diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 27a3c87fd..1472f308d 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -349,4 +349,12 @@ class debian_org {
 		key   => 'kernel.unprivileged_bpf_disabled',
 		value => '1',
 	}
+
+	# Disable kpartx udev rules
+	if $has_lib_udev_rules_d_60_kpartx_rules {
+		file { '/etc/udev/rules.d/60-kpartx.rules':
+			content => "",
+			mode => '0444',
+		}
+	}
 }