projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more ordering
[mirror/dsa-puppet.git]
/
modules
/
site
/
manifests
/
alternative.pp
diff --git
a/modules/site/manifests/alternative.pp
b/modules/site/manifests/alternative.pp
index
d7488be
..
1a40c15
100644
(file)
--- a/
modules/site/manifests/alternative.pp
+++ b/
modules/site/manifests/alternative.pp
@@
-3,7
+3,7
@@
define site::alternative ($linkto, $ensure = present) {
present: {
if $::lsbdistcodename == 'lenny' {
exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}":
present: {
if $::lsbdistcodename == 'lenny' {
exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}":
- unless => "[ $(
basename $(readlink -f /etc/alternatives/${name})
) = ${linkto} ]",
+ unless => "[ $(
readlink -f /etc/alternatives/${name}
) = ${linkto} ]",
}
} else {
exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}":
}
} else {
exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}":
@@
-14,7
+14,7
@@
define site::alternative ($linkto, $ensure = present) {
absent: {
if $::lsbdistcodename == 'lenny' {
exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}":
absent: {
if $::lsbdistcodename == 'lenny' {
exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}":
- unless => "[ $(
basename $(readlink -f /etc/alternatives/${name})
) != ${linkto} ]",
+ unless => "[ $(
readlink -f /etc/alternatives/${name}
) != ${linkto} ]",
}
} else {
exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}":
}
} else {
exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}":