Remove setfiles from mkrootfsimage
SELinux applies the correct labels, setfiles is no longer needed.
This allows lorax to run with SELinux in Enforcing mode.
(cherry picked from commit 4a4a415f88)
This commit is contained in:
parent
e52d40216c
commit
8105443bc6
@ -112,19 +112,6 @@ def mkrootfsimg(rootdir, outfile, label, size=2, sysroot=""):
|
||||
fssize = None # Let mkext4img figure out the needed size
|
||||
|
||||
mkext4img(rootdir, outfile, label=label, size=fssize)
|
||||
# Reset selinux context on new rootfs
|
||||
with LoopDev(outfile) as loopdev:
|
||||
with Mount(loopdev) as mnt:
|
||||
cmd = [ "setfiles", "-e", "/proc", "-e", "/sys", "-e", "/dev",
|
||||
"-e", "/install", "-e", "/ostree",
|
||||
"/etc/selinux/targeted/contexts/files/file_contexts", "/"]
|
||||
root = join(mnt, sysroot.lstrip("/"))
|
||||
try:
|
||||
runcmd(cmd, root=root)
|
||||
except CalledProcessError as e:
|
||||
logger.error("setfiles exited with a non-zero return code (%d) which may "
|
||||
"be caused by running without SELinux in Permissive mode.", e.returncode)
|
||||
raise
|
||||
|
||||
|
||||
######## Utility functions ###############################################
|
||||
|
||||
Loading…
Reference in New Issue
Block a user