X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Falternative.pp;h=2853e11d9ce106541786d72cec5a1476d1216d60;hb=74b848186ff77f1247370d033d9e7e8806193317;hp=1a40c1575ffe8e3993d2527747e904ab56e3522a;hpb=4c8914fcf7250350f39ba26cf25c6f817afa6ddb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/site/manifests/alternative.pp b/modules/site/manifests/alternative.pp
index 1a40c1575..2853e11d9 100644
--- a/modules/site/manifests/alternative.pp
+++ b/modules/site/manifests/alternative.pp
@@ -1,25 +1,13 @@
 define site::alternative ($linkto, $ensure = present) {
 	case $ensure {
 		present: {
-			if $::lsbdistcodename == 'lenny' {
-				exec { "/usr/sbin/update-alternatives --set ${name} ${linkto}":
-					unless => "[ $(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} ]",
-				}
+			exec { "/usr/bin/update-alternatives --set ${name} ${linkto}":
+				unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') = ${linkto} ]",
 			}
 		}
 		absent: {
-			if $::lsbdistcodename == 'lenny' {
-				exec { "/usr/sbin/update-alternatives --remove ${name} ${linkto}":
-					unless => "[ $(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} ]",
-				}
+			exec { "/usr/bin/update-alternatives --remove ${name} ${linkto}":
+				unless => "[ $(update-alternatives --query ${name} | grep ^Value | awk '{print \$2}') != ${linkto} ]",
 			}
 		}
 		default: { fail ( "Unknown ensure value: '$ensure'" ) }