summaryrefslogtreecommitdiff
path: root/lib/chef/util
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2013-05-28 09:19:47 -0700
committersersut <serdar@opscode.com>2013-05-28 11:10:29 -0700
commitba2afa8442d6ed92c78e3397cdffce8cd12768b4 (patch)
tree31c354fbde4306a25d6a79c13f0a4001ec0a2752 /lib/chef/util
parent62e530b00e6593b28b3f08b6dead75b961b92bcb (diff)
downloadchef-ba2afa8442d6ed92c78e3397cdffce8cd12768b4.tar.gz
Changed based on PR comments.
Diffstat (limited to 'lib/chef/util')
-rw-r--r--lib/chef/util/selinux.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/util/selinux.rb b/lib/chef/util/selinux.rb
index d195c6bd1f..1da3e88913 100644
--- a/lib/chef/util/selinux.rb
+++ b/lib/chef/util/selinux.rb
@@ -49,7 +49,7 @@ class Chef
restorecon_command = recursive ? "#{restorecon_path} -R -r" : "#{restorecon_path} -R"
restorecon_command += " #{file_path}"
Chef::Log.debug("Restoring selinux security content with #{restorecon_command}")
- shell_out(restorecon_command)
+ shell_out!(restorecon_command)
else
Chef::Log.warn "Can not find 'restorecon' on the system. Skipping selinux security context restore."
end
@@ -78,7 +78,7 @@ class Chef
def check_selinux_enabled?
if selinuxenabled_path
- cmd = shell_out(selinuxenabled_path)
+ cmd = shell_out!(selinuxenabled_path, :returns => [0,1])
case cmd.exitstatus
when 1
return false