From 5fb824e35f59615799767cb99e87948d1e672acf Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 9 May 2005 19:16:13 +0000
Subject: if you boot without selinux support, make sure things are
 automaitically relabelled later (<dwalsh@redhat.com>)

---
 rc.d/rc.sysinit | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'rc.d/rc.sysinit')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 708b0dc5..2ab733a2 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -490,11 +490,14 @@ if [ -x /sbin/quotaon ]; then
 fi
 
 # Check to see if a full relabel is needed
-if [ -n "$SELINUX" -a -f /.autorelabel ]; then
-   relabel_selinux
-fi
-if [ -n "$SELINUX" ] && strstr "$cmdline" autorelabel ; then
-   relabel_selinux
+if [ -n "$SELINUX" ]; then 
+    if [ -f /.autorelabel ] || strstr "$cmdline" autorelabel ; then
+	relabel_selinux
+    fi
+else
+    if [ -d /etc/selinux ]; then
+        [ -f /.autorelabel ] || touch /.autorelabel
+    fi
 fi
 
 
-- 
cgit v1.2.1