aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-09-09 05:44:02 +0000
committerBill Nottingham <notting@redhat.com>2005-09-09 05:44:02 +0000
commit42e101cf88659de34a3db251e2c369d7701bd537 (patch)
tree289a9d812a2140b4d92d0ab4282ad9cb785462c9
parent0b5a3e4939adcc014aa98f202c22e73efad29838 (diff)
downloadinitscripts-42e101cf88659de34a3db251e2c369d7701bd537.tar
initscripts-42e101cf88659de34a3db251e2c369d7701bd537.tar.gz
initscripts-42e101cf88659de34a3db251e2c369d7701bd537.tar.bz2
initscripts-42e101cf88659de34a3db251e2c369d7701bd537.tar.xz
initscripts-42e101cf88659de34a3db251e2c369d7701bd537.zip
Fix on-boot relabelling (<dwalsh@redhat.com>)
-rwxr-xr-xrc.d/rc.sysinit11
1 files changed, 5 insertions, 6 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 8bfbeab1..29db361c 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -54,16 +54,15 @@ relabel_selinux() {
if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
chvt 1
fi
+ . /etc/selinux/config
echo "
- *** Warning -- SELinux relabel is required. ***
- *** Disabling security enforcement. ***
- *** Relabeling could take a very long time, ***
- *** depending on file system size. ***
+ *** Warning -- SELinux ${SELINUXTYPE} policy relabel is required. ***
+ *** Relabelling could take a very long time, depending on file ***
+ *** system size and speed of hard drives. ***
"
echo "0" > $selinuxfs/enforce
- /sbin/fixfiles -f -F relabel > /dev/null 2>&1
+ /sbin/fixfiles restore > /dev/null 2>&1
rm -f /.autorelabel
- echo "*** Enabling security enforcement. ***"
echo $SELINUX > $selinuxfs/enforce
if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
chvt 8