aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Walsh <dwalsh@redhat.com>2004-10-05 19:36:53 +0000
committerDan Walsh <dwalsh@redhat.com>2004-10-05 19:36:53 +0000
commitf953f9004fd0d3fd3d2cc365b0f94a2e14f022e0 (patch)
tree5dad34390c3327c3740330dbd05dffbe26843c8b
parent56a840eecd1a59438d27dcad3c5ed077dca80ca0 (diff)
downloadinitscripts-f953f9004fd0d3fd3d2cc365b0f94a2e14f022e0.tar
initscripts-f953f9004fd0d3fd3d2cc365b0f94a2e14f022e0.tar.gz
initscripts-f953f9004fd0d3fd3d2cc365b0f94a2e14f022e0.tar.bz2
initscripts-f953f9004fd0d3fd3d2cc365b0f94a2e14f022e0.tar.xz
initscripts-f953f9004fd0d3fd3d2cc365b0f94a2e14f022e0.zip
don't remount inside of SELinux relabel code
-rw-r--r--initscripts.spec5
-rwxr-xr-xrc.d/rc.sysinit4
2 files changed, 4 insertions, 5 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 5783dfa4..26b11daf 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 7.86
+Version: 7.87
License: GPL
Group: System Environment/Base
Release: 1
@@ -207,6 +207,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Tue Oct 5 2004 Dan Walsh <notting@redhat.com> - 7.87-1
+- Change SELinux relabel to not remount /
+
* Fri Oct 1 2004 Bill Nottingham <notting@redhat.com> - 7.86-1
- use /etc/hotplug/blacklist to blacklist modules in hardware init (#132719)
- filter indic locales on the console (#134198)
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 7a3e1312..54787520 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -63,12 +63,8 @@ relabel_selinux() {
*** depending on file system size. ***
"
echo "0" > $selinuxfs/enforce
- mount -n -o remount,rw /
- mount -a
/sbin/fixfiles -F relabel > /dev/null 2>&1
rm -f /.autorelabel
- mount -n -o remount,ro /
- umount -a
echo "*** Enabling security enforcement. ***"
echo $SELINUX > $selinuxfs/enforce
}