X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=09d3ac7494a5f49f75e45606930571c42dddb907;hb=ae28efb515e71ab64998b1e67374651298513584;hp=9e1c384e63136dc72dc30c1b3c629bfaf5cae8b2;hpb=e359026e3ec5d9b5726f3b1834e07c3d307c0a0e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 9e1c384e6..09d3ac749 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -185,6 +185,7 @@ class debian_org {
 		content  => @(EOF)
 			## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 			SHELL=/bin/bash
+			MAILTO=root
 			PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/nagios/plugins
 			| EOF
 	}
@@ -348,4 +349,11 @@ class debian_org {
 		key   => 'kernel.unprivileged_bpf_disabled',
 		value => '1',
 	}
+
+	# Disable kpartx udev rules
+	file { '/etc/udev/rules.d/60-kpartx.rules':
+		ensure => $has_lib_udev_rules_d_60_kpartx_rules ? { true  => 'present', default => 'absent' },
+		content => "",
+		mode => '0444',
+	}
 }