X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Falternative.pp;h=2853e11d9ce106541786d72cec5a1476d1216d60;hb=b6527ce00278fa0b57893dd148768f0b0481ad3a;hp=94d088818a71398109adf270bb35e7603a28a394;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/site/manifests/alternative.pp b/modules/site/manifests/alternative.pp
index 94d088818..2853e11d9 100644
--- a/modules/site/manifests/alternative.pp
+++ b/modules/site/manifests/alternative.pp
@@ -1,17 +1,15 @@
 define site::alternative ($linkto, $ensure = present) {
 	case $ensure {
 		present: {
-			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: {
-			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: { err ( "Unknown ensure value: '$ensure'" ) }
+		default: { fail ( "Unknown ensure value: '$ensure'" ) }
 	}
 }