Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixing for puppet 2.6

  • Loading branch information...
commit dfd152c39748c3cfe1b876b167f705fc2298730c 1 parent ba28f30
Phillip Oldham authored
Showing with 7 additions and 7 deletions.
  1. +5 −5 manifests/classes/lsb_release.pp
  2. +2 −2 manifests/defines/line.pp
View
10 manifests/classes/lsb_release.pp
@@ -22,7 +22,7 @@
case $lsbdistcodename {
'': {
err("Please install lsb_release or set facter_lsbdistcodename in the environment of $fqdn")
- exec { "false # assert_lsbdistcodename": alias => assert_lsbdistcodename, loglevel => err }
+ exec { "/bin/false # assert_lsbdistcodename": alias => assert_lsbdistcodename, loglevel => err }
}
'n/a': {
case $operatingsystem {
@@ -33,11 +33,11 @@
err("lsb_release was unable to report your distcodename; please set facter_lsbdistcodename in the environment of $fqdn")
}
}
- exec { "false # assert_lsbdistcodename": alias => assert_lsbdistcodename, loglevel => err }
+ exec { "/bin/false # assert_lsbdistcodename": alias => assert_lsbdistcodename, loglevel => err }
}
default: {
- exec { "true # assert_lsbdistcodename": alias => assert_lsbdistcodename, loglevel => debug }
- exec { "true # require_lsbdistcodename": alias => require_lsbdistcodename, loglevel => debug }
+ exec { "/bin/true # assert_lsbdistcodename": alias => assert_lsbdistcodename, loglevel => debug }
+ exec { "/bin/true # require_lsbdistcodename": alias => require_lsbdistcodename, loglevel => debug }
}
}
@@ -45,5 +45,5 @@
# To fail the complete compilation on a missing $lsbdistcodename, include this class
class require_lsbdistcodename inherits assert_lsbdistcodename {
- exec { "false # require_lsbdistcodename": require => Exec[require_lsbdistcodename], loglevel => err }
+ exec { "/bin/false # require_lsbdistcodename": require => Exec[require_lsbdistcodename], loglevel => err }
}
View
4 manifests/defines/line.pp
@@ -42,12 +42,12 @@
case $ensure {
default : { err ( "unknown ensure value '${ensure}'" ) }
present: {
- exec { "echo '${line}' >> '${file}'":
+ exec { "/bin/echo '${line}' >> '${file}'":
unless => "grep -qFx '${line}' '${file}'"
}
}
absent: {
- exec { "perl -ni -e 'print if \$_ ne \"${line}\n\";' '${file}'":
+ exec { "/usr/bin/perl -ni -e 'print if \$_ ne \"${line}\n\";' '${file}'":
onlyif => "grep -qFx '${line}' '${file}'"
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.