From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 27 Sep 2016 06:44:46 +0000 (+0200)
Subject: Mask proc-sys-fs-binfmt_misc.automount
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b96e33e4e16215c9c8acf66ea10fec065805d201;p=mirror%2Fdsa-puppet.git

Mask proc-sys-fs-binfmt_misc.automount
---

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index d49feca8c..d7df4f621 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -279,6 +279,11 @@ class debian-org {
 		target => '/dev/null',
 		notify => Exec['systemctl daemon-reload'],
 	}
+	file { '/etc/systemd/system/proc-sys-fs-binfmt_misc.automount':
+		ensure => 'link',
+		target => '/dev/null',
+		notify => Exec['systemctl daemon-reload'],
+	}
 
 	file { '/etc/cron.d/dsa-puppet-stuff':
 		content => template('debian-org/dsa-puppet-stuff.cron.erb'),
diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 39e91d572..7bbf6788b 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -383,6 +383,7 @@ file=/etc/apt/apt.conf.d/local-pdiffs
 file=/etc/apt/apt.conf.d/local-ssl-ca-global
 file=/etc/apt/preferences.d/buildd
 file=/etc/systemd/system/puppet.service
+file=/etc/systemd/system/proc-sys-fs-binfmt_misc.automount
 file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
 file=/etc/default/postgrey