X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Falternative.pp;fp=modules%2Fsite%2Fmanifests%2Falternative.pp;h=d7488bee348d2880584574009e1db780ba0f37aa;hb=19c567d5109b124b1c5d7126e645f9fbd9f39199;hp=c207df882d4dda95c76f39be9a38711d3fa00c1c;hpb=fe4a49bcab3b096d08de2a03c9b2106acab23bc2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/site/manifests/alternative.pp b/modules/site/manifests/alternative.pp
index c207df882..d7488bee3 100644
--- a/modules/site/manifests/alternative.pp
+++ b/modules/site/manifests/alternative.pp
@@ -1,15 +1,25 @@
 define site::alternative ($linkto, $ensure = present) {
 	case $ensure {
 		present: {
-			exec {
-				"/usr/sbin/update-alternatives --set ${name} ${linkto}":
+			if $::lsbdistcodename == 'lenny' {
+				exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}":
+					unless => "[ $(basename $(readlink -f /etc/alternatives/${name})) = ${linkto} ]",
+				}
+			} else {
+				exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}":
 					unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') = ${linkto} ]",
+				}
 			}
 		}
 		absent: {
-			exec {
-				"/usr/sbin/update-alternatives --remove ${name} ${linkto}":
+			if $::lsbdistcodename == 'lenny' {
+				exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}":
+					unless => "[ $(basename $(readlink -f /etc/alternatives/${name})) != ${linkto} ]",
+				}
+			} else {
+				exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}":
 					unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') != ${linkto} ]",
+				}
 			}
 		}
 		default: { fail ( "Unknown ensure value: '$ensure'" ) }