From 7088577a20b7aeac6365c5a3fd290f6f859d8a97 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 2 Mar 2016 23:24:16 +0100 Subject: [PATCH] ferm: squeeze cleanup Signed-off-by: Julien Cristau --- modules/ferm/manifests/module.pp | 5 ----- modules/ferm/templates/load_module.erb | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) 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'; -- 2.20.1