From 063329c368a80270744e3de17b1116f3b2cba181 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 27 Jun 2000 19:26:13 +0000
Subject: *** empty log message ***

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

diff --git a/ChangeLog b/ChangeLog
index 1912e9e3..8c652fe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-27  Bill Nottingham  <notting@redhat.com>
+
+	* rc.d/rc.sysinit: don't mount /dev/shm
+
+	* initscripts.spec: tweak %pre
+
 2000-06-27  Bill Nottingham  <notting@redhat.com>
 
 	* initscripts.spec: tweak %pre
diff --git a/initscripts.spec b/initscripts.spec
index 4189497e..c5cf84a9 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -66,7 +66,7 @@ touch $RPM_BUILD_ROOT/var/log/wtmp
 
 %pre
 /usr/sbin/groupadd -g 22 -r -f utmp
-if [ -d /etc/rc.d ]; then
+if [ -d /etc/rc.d -a ! -L /etc/rc.d ]; then
    cp -af /etc/rc.d/* /etc && rm -rf /etc/rc.d && ln -snf . /etc/rc.d
 fi
 
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 8c72cfc2..09ad5982 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -13,10 +13,6 @@ fi
 # If we're using devfs, start devfsd now - we need the old device names
 [ -e /dev/.devfsd -a -x /sbin/devfsd ] && /sbin/devfsd /dev
 
-# Mount shm - ignore errors because the only "error" that can occur is
-# a kernel < 2.3.99 which doesn't require /dev/shm
-mount -t shm none /dev/shm &>/dev/null || :
-
 # Set the path
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export PATH
-- 
cgit