Qualify grep and switch to file_line

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 991bebd042ccab221a8cb0dab57ff013b9b9060c..a650c355d5f3445a4bd52f7ffa7351d1688990f9 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -64,7 +64,7 @@ define virtual::vserver(
   # we have to do it for each vserver, see
   # http://linux-vserver.org/Secure_chroot_Barrier#Solution:_Secure_Barrier
   exec { "/usr/sbin/setattr --barrier /etc/vservers/${vs_name}/vdir/../":
-    unless  => "/usr/sbin/showattr /etc/vservers/${vs_name}/vdir/../ | grep -- '----Bui- /etc/vservers/${vs_name}/vdir/../$'",
+    unless  => "/usr/sbin/showattr /etc/vservers/${vs_name}/vdir/../ | /bin/grep -- '----Bui- /etc/vservers/${vs_name}/vdir/../$'",
     require => Exec["vserver_instance_${vs_name}"],
   }
 

diff --git a/manifests/vserver/cflags.pp b/manifests/vserver/cflags.pp
index 462c9e47e97fe785e69e6f92d262aa3435e5d515..92c4040800c3bee31ed330b44309585d7b387048 100644 (file)
--- a/manifests/vserver/cflags.pp
+++ b/manifests/vserver/cflags.pp
@@ -5,9 +5,9 @@ define virtual::vserver::cflags($vserver, $flag, $ensure = present) {
     }
   }
 
-  line {"vs_cflags-${vserver}-${flag}":
+  file_line {"vs_cflags-${vserver}-${flag}":
     ensure  => $ensure,
-    file    => "/etc/vservers/${vserver}/cflags",
+    path    => "/etc/vservers/${vserver}/cflags",
     line    => "${flag}",
     require => Exec["vserver_instance_${vserver}"],
     notify  => Exec["vattribute-${vserver}-${flag}"],

diff --git a/manifests/vserver/host.pp b/manifests/vserver/host.pp
index 69718dd0ce0490e6960cd46b8efcaa4b26982cd1..081fd0773c679221affe3e47050ea6a103555e62 100644 (file)
--- a/manifests/vserver/host.pp
+++ b/manifests/vserver/host.pp
@@ -57,8 +57,8 @@ class virtual::vserver::host($vdirbase = "/var/lib/vservers") {
   }
 
   # remove dummy interfaces on the host
-  line { modules_dummy:
-    file   => "/etc/modules",
+  file_line { modules_dummy:
+    path   => "/etc/modules",
     line   => "^dummy",
     ensure => absent,
   }