From 0b9e965096d0cfb20284c587262945c8599ea4a3 Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@eucalyptus.com>
Date: Fri, 20 Sep 2013 16:34:41 -0700
Subject: When selinux is completely disabled functions like restorecon raise
exceptions, causing nasty things to happen on instances that boot with
selinux=0. The fix is easy: simply consult is_selinux_enabled() first.
---
cloudinit/util.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloudinit/util.py b/cloudinit/util.py
index d50d3e18..deac8c8d 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -161,13 +161,13 @@ class SeLinuxGuard(object):
self.recursive = recursive
def __enter__(self):
- if self.selinux:
+ if self.selinux and self.selinux.is_selinux_enabled():
return True
else:
return False
def __exit__(self, excp_type, excp_value, excp_traceback):
- if self.selinux:
+ if self.selinux and self.selinux.is_selinux_enabled():
path = os.path.realpath(os.path.expanduser(self.path))
do_restore = False
try:
--
cgit v1.2.3