From dbbffae53a46ffb3b7f6be1e0961a6ae33e104f2 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 29 Dec 2012 09:52:05 +0000 Subject: [PATCH] update load_module hook Signed-off-by: Stephen Gran --- modules/ferm/manifests/module.pp | 5 +++++ modules/ferm/templates/load_module.erb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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'; -- 2.20.1