From: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed, 28 Aug 2019 10:17:21 +0000 (+0200)
Subject: Fix another typo
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=bec629e9a4027ecd47a92aa70e768c7b569dc97e;p=mirror%2Fdsa-puppet.git

Fix another typo
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 80a1dc144..66a39c62a 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -531,7 +531,7 @@ dir=10/var/lib/puppet/clientbucket
 ## for these files, only access time is ignored
 ##
 dir=/usr/bin
-<%- if has_variable?("merged_usr") && @merged_user -%>
+<%- if has_variable?("merged_usr") && @merged_usr -%>
 file=/bin
 <% else -%>
 dir=/bin
@@ -541,7 +541,7 @@ dir=/boot
 # SuSE (old) has the boot init scripts in /sbin/init.d/*, 
 # so we go 3 levels deep
 #
-<%- if has_variable?("merged_usr") && @merged_user -%>
+<%- if has_variable?("merged_usr") && @merged_usr -%>
 file=/lib
 file=/sbin
 <% else -%>