From: Stephen Gran <steve@lobefin.net>
Date: Sat, 29 Dec 2012 09:52:05 +0000 (+0000)
Subject: update load_module hook
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=dbbffae53a46ffb3b7f6be1e0961a6ae33e104f2;p=mirror%2Fdsa-puppet.git

update load_module hook

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/ferm/manifests/module.pp b/modules/ferm/manifests/module.pp
index 076d3e5bc..8ef922568 100644
--- a/modules/ferm/manifests/module.pp
+++ b/modules/ferm/manifests/module.pp
@@ -15,6 +15,11 @@ 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 a4943b08a..9defae549 100644
--- a/modules/ferm/templates/load_module.erb
+++ b/modules/ferm/templates/load_module.erb
@@ -1 +1 @@
-hook <%= scope.lookupvar('hookstage') %> 'modprobe <%= scope.lookupvar('module') %> || true';
+<%= @hook_prefix -%>hook <%= @hookstage -%> 'modprobe <%= @module -%> || true';