sudo/extentions should not be set globally but appended to for

xbmc::live recipe.
fnichol · Dec 4, 2010 · 28de2b9 · 28de2b9
1 parent da22a10
commit 28de2b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/attributes/live.rb b/attributes/live.rb
@@ -17,11 +17,3 @@
 # limitations under the License.
 #
 
-default[:authorization][:sudo][:extensions] << <<-SUDO
-### XBMC-specific configuration ###
-# XBMC
-Cmnd_Alias SHUTDOWN_CMDS = /sbin/shutdown, /sbin/reboot, /sbin/halt # XBMC
-Cmnd_Alias MOUNT_CMDS = /bin/mount, /bin/umount # XBMC
-xbmc ALL=NOPASSWD: SHUTDOWN_CMDS, MOUNT_CMDS # XBMC
-SUDO
-
diff --git a/recipes/live.rb b/recipes/live.rb
@@ -43,6 +43,14 @@
   end
 end
 
+node[:authorization][:sudo][:extensions] << <<-SUDO.gsub(/^ {2}/, '')
+  ### XBMC-specific configuration ###
+  # XBMC
+  Cmnd_Alias SHUTDOWN_CMDS = /sbin/shutdown, /sbin/reboot, /sbin/halt # XBMC
+  Cmnd_Alias MOUNT_CMDS = /bin/mount, /bin/umount # XBMC
+  xbmc ALL=NOPASSWD: SHUTDOWN_CMDS, MOUNT_CMDS # XBMC
+SUDO
+
 %w{xbmc-live policykit-1 upower}.each do |pkg|
   package pkg
 end