From: Julien Cristau <jcristau@debian.org>
Date: Wed, 2 Mar 2016 22:24:16 +0000 (+0100)
Subject: ferm: squeeze cleanup
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7088577a20b7aeac6365c5a3fd290f6f859d8a97;p=mirror%2Fdsa-puppet.git

ferm: squeeze cleanup

Signed-off-by: Julien Cristau <jcristau@debian.org>
---

diff --git a/modules/ferm/manifests/module.pp b/modules/ferm/manifests/module.pp
index 8ef922568..076d3e5bc 100644
--- a/modules/ferm/manifests/module.pp
+++ b/modules/ferm/manifests/module.pp
@@ -15,11 +15,6 @@ define ferm::module (
 		$module = $title
 	}
 
-	$hook_prefix = $::lsbdistcodename ? {
-		squeeze => '',
-		default => '@',
-	}
-
 	if $::kernel == 'Linux' {
 		file { "/etc/ferm/conf.d/load_${module}.conf":
 			ensure  => $ensure,
diff --git a/modules/ferm/templates/load_module.erb b/modules/ferm/templates/load_module.erb
index 9defae549..1916109d7 100644
--- a/modules/ferm/templates/load_module.erb
+++ b/modules/ferm/templates/load_module.erb
@@ -1 +1 @@
-<%= @hook_prefix -%>hook <%= @hookstage -%> 'modprobe <%= @module -%> || true';
+@hook <%= @hookstage -%> 'modprobe <%= @module -%> || true';