]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
update load_module hook
authorStephen Gran <steve@lobefin.net>
Sat, 29 Dec 2012 09:52:05 +0000 (09:52 +0000)
committerStephen Gran <steve@lobefin.net>
Sat, 29 Dec 2012 09:52:09 +0000 (09:52 +0000)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/ferm/manifests/module.pp
modules/ferm/templates/load_module.erb

index 076d3e5bc907c5d1b8c8cba93d7efb1b4e56e03c..8ef922568cda12de1440c297fb7aa683658afa0f 100644 (file)
@@ -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,
index a4943b08aee4efe1f124578998479b89d1d2633b..9defae5493cbeb6e961bf6aa4564bd2fc00c949f 100644 (file)
@@ -1 +1 @@
-hook <%= scope.lookupvar('hookstage') %> 'modprobe <%= scope.lookupvar('module') %> || true';
+<%= @hook_prefix -%>hook <%= @hookstage -%> 'modprobe <%= @module -%> || true';