summaryrefslogtreecommitdiff
path: root/src/network/networkd.conf.in
diff options
context:
space:
mode:
authorWill Woods <wwoods@redhat.com>2014-04-25 18:26:34 -0400
committerLennart Poettering <lennart@poettering.net>2014-05-16 20:09:02 +0200
commit68d3acaccbd26ecfbc5881fea75968fa4abcc565 (patch)
treeda9c2901bf7debb72a4af6f3e2fbb0f32b6530a4 /src/network/networkd.conf.in
parentd36d90933a832bd1e1eb8e3d16b3de73f91636b4 (diff)
core: let selinux_setup() load policy more than once
When you switch-root into a new root that has SELinux policy, you're supposed to to run selinux_init_load_policy() to set up SELinux and load policy. Normally this gets handled by selinux_setup(). But if SELinux was already initialized, selinux_setup() skips loading policy and returns 0. So if you load policy normally, and then you switch-root to a new root that has new policy, selinux_setup() never loads the new policy. What gives? As far as I can tell, this check is an artifact of how selinux_setup() worked when it was first written (see commit c4dcdb9 / systemd v12): * when systemd starts, run selinux_setup() * if selinux_setup() loads policy OK, restart systemd So the "if policy already loaded, skip load and return 0" check was there to prevent an infinite re-exec loop. Modern systemd only calls selinux_setup() on initial load and after switch-root, and selinux_setup() no longer restarts systemd, so we don't need that check to guard against the infinite loop anymore. So: this patch removes the "return 0", thus allowing selinux_setup() to actually perform SELinux setup after switch-root. We still want to check to see if SELinux is initialized, because if selinux_init_load_policy() fails *but* SELinux is initialized that means we still have (old) policy active. So we don't need to halt if enforce=1.
Diffstat (limited to 'src/network/networkd.conf.in')
0 files changed, 0 insertions, 0 deletions