fix selinux disabled state

Execute load-policy when the config file contains SELINUX=disabled.
master
Harald Hoyer 2010-02-15 12:58:00 +01:00
parent 21a74b32b2
commit 7800cc247e
1 changed files with 6 additions and 1 deletions

View File

@ -7,10 +7,11 @@ rd_load_policy()
SELINUX="enforcing"
[ -e "$NEWROOT/etc/selinux/config" ] && . "$NEWROOT/etc/selinux/config"

disabled=0
# If SELinux is disabled exit now
getarg "selinux=0" > /dev/null
if [ $? -eq 0 -o "$SELINUX" = "disabled" ]; then
return 0
disabled=1
fi

# Check whether SELinux is in permissive mode
@ -36,6 +37,10 @@ rd_load_policy()
fi
} 2>&1 | vinfo

if [ $disabled -eq 1 ]; then
return 0;
fi

if [ $ret -eq 0 -o $ret -eq 2 ]; then
# If machine requires a relabel, force to permissive mode
[ -e "$NEWROOT"/.autorelabel ] && ( echo 0 > "$NEWROOT"/selinux/enforce )