From 5ff6edd0bc3e8b852c4543bdd751c3db296a8824 Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@redhat.com>
Date: Wed, 8 Sep 2004 17:41:42 +0000
Subject: Fix call to restorecon

---
 initscripts.spec | 6 +++++-
 rc.d/rc.sysinit  | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index df708ee0..efab6479 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -3,7 +3,7 @@ Name: initscripts
 Version: 7.78
 License: GPL
 Group: System Environment/Base
-Release: 1
+Release: 2
 Source: initscripts-%{version}.tar.bz2
 URL: http://fedora.redhat.com/projects/additional-projects/initscripts/
 Patch0: initscripts-s390.patch
@@ -205,6 +205,10 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Wed Sep  8 2004 Dan Walsh <dwalshg@redhat.com> - 7.78-2
+- fix setting SELinux contexts on udev-created-in-initrd devices
+- Let restorecon check if selinux is enabled.
+
 * Wed Sep  8 2004 Bill Nottingham <notting@redhat.com> - 7.78-1
 - set SELinux contexts on udev-created-in-initrd devices, if necessary
 
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index b40c31d0..db6b3d10 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -41,9 +41,9 @@ if [ -n "$selinuxfs" ] && [ "`cat /proc/self/attr/current`" != "kernel" ]; then
 	fi
 fi
 
-if [ "$SELINUX" = "1" -a -x /sbin/restorecon ] && fgrep -q " /dev " /proc/mounts ; then
-	restorecon  /dev /dev/null
-	restorecon  /dev/* 2> /dev/null
+if [ -x /sbin/restorecon ] && fgrep -q " /dev " /proc/mounts ; then
+	/sbin/restorecon  /dev /dev/null
+	/sbin/restorecon  /dev/* 2> /dev/null
 fi
 
 disable_selinux() {
-- 
cgit v1.2.1