livecd-tools/debug-setfiles.patch

29 lines
1.3 KiB
Diff

diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 32d26b2..94a31a1 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -479,10 +479,19 @@ class SelinuxConfig(KickstartConfig):
return
try:
- rc = subprocess.call(['setfiles', '-p', '-e', '/proc',
- '-e', '/sys', '-e', '/dev',
- selinux.selinux_file_context_path(), '/'],
- preexec_fn=self.chroot)
+ cmd = ['setfiles', '-p', '-e', '/proc',
+ '-e', '/sys', '-e', '/dev',
+ selinux.selinux_file_context_path(), '/']
+ proc = subprocess.Popen(cmd,
+ preexec_fn=self.chroot,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ outs, errs = proc.communicate()
+ rc = proc.returncode
+ logging.info("setfiles command: {0}".format(cmd))
+ logging.info("setfiles returncode: {0}".format(rc))
+ logging.info("setfiles stdout: {0}".format(outs))
+ logging.info("setfiles stderr: {0}".format(errs))
except OSError as e:
if e.errno == errno.ENOENT:
logging.info('The setfiles command is not available.')