tools/livecd-creator | 11 -----------
1 file changed, 11 deletions(-)
New commits:
commit bfef1f8fa5a6f18b78882755271d0fe174b8c48b
Author: Brian C. Lane <[email protected]>
Date: Tue Jan 14 11:09:59 2014 -0800
Remove switch to Permissive (#1051523)
SELinux has improved to the point where livecd-creator can be run with
it in Enforcing mode so it is no longer necessary to switch to
Permissive. If problems come up in the future they should be corrected
with SELinux policy.
diff --git a/tools/livecd-creator b/tools/livecd-creator
index a39e43f..44d07a1 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -23,7 +23,6 @@ import sys
import time
import optparse
import logging
-import selinux
import imgcreate
from imgcreate.fs import makedirs
@@ -144,12 +143,6 @@ def main():
print >> sys.stderr, "You must run %s as root" % sys.argv[0]
return 1
- # Set selinux to Permissive if it is enforcing
- selinux_enforcing = False
- if selinux.is_selinux_enabled() and selinux.security_getenforce():
- selinux_enforcing = True
- selinux.security_setenforce(0)
-
if options.fslabel:
fslabel = options.fslabel
name = fslabel
@@ -203,8 +196,6 @@ def main():
else:
# Cannot happen, we validate this when parsing options.
logging.error(u"'%s' is not a valid image type" % options.image_type)
- if selinux_enforcing:
- selinux.security_setenforce(1)
return 1
creator.compress_type = options.compress_type
@@ -228,8 +219,6 @@ def main():
return 1
finally:
creator.cleanup()
- if selinux_enforcing:
- selinux.security_setenforce(1)
return 0
--
livecd mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/livecd
