aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-11-24 20:24:09 +0000
committerBill Nottingham <notting@redhat.com>2004-11-24 20:24:09 +0000
commit74517f6fedbeb00e6a500555bcbaef9be389e7d6 (patch)
treedfacc1318196156b2a092c91f515f86ca6677383 /rc.d
parent6a0ea2ec626bcfa044e6dd7955dafd19bed0193e (diff)
downloadinitscripts-74517f6fedbeb00e6a500555bcbaef9be389e7d6.tar
initscripts-74517f6fedbeb00e6a500555bcbaef9be389e7d6.tar.gz
initscripts-74517f6fedbeb00e6a500555bcbaef9be389e7d6.tar.bz2
initscripts-74517f6fedbeb00e6a500555bcbaef9be389e7d6.tar.xz
initscripts-74517f6fedbeb00e6a500555bcbaef9be389e7d6.zip
remove more devfs compat
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/init.d/halt2
-rwxr-xr-xrc.d/rc.sysinit6
2 files changed, 2 insertions, 6 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index 8f2a30ca..ba25911d 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -25,7 +25,7 @@ runcmd() {
halt_get_remaining() {
awk '$2 ~ /^\/$|^\/proc|^\/sys|^\/dev/{next}
$3 == "tmpfs" || $3 == "proc" {print $2 ; next}
- /(^#|loopfs|autofs|devfs|^none|^\/dev\/ram|^\/dev\/root)/ {next}
+ /(^#|loopfs|autofs|^none|^\/dev\/ram|^\/dev\/root)/ {next}
{print $2}' /proc/mounts
}
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 7d346c6c..29ee33cf 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -422,9 +422,6 @@ if [ -z "$fastboot" -a "$READONLY" != "yes" ]; then
fi
# Unmount the initrd, if necessary
if LC_ALL=C fgrep -q /initrd /proc/mounts && ! LC_ALL=C fgrep -q /initrd/loopfs /proc/mounts ; then
- if [ -e /initrd/dev/.devfsd ]; then
- umount /initrd/dev
- fi
umount /initrd
/sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
fi
@@ -478,13 +475,12 @@ fi
# Remove stale backups
rm -f /etc/mtab~ /etc/mtab~~
-# Enter root, /proc and (potentially) /proc/bus/usb and devfs into mtab.
+# Enter root, /proc and (potentially) /proc/bus/usb into mtab.
mount -f /
mount -f /proc
mount -f /sys >/dev/null 2>&1
mount -f /dev/pts
[ -f /proc/bus/usb/devices ] && mount -f -t usbfs usbfs /proc/bus/usb
-[ -e /dev/.devfsd ] && mount -f -t devfs devfs /dev
# The root filesystem is now read-write, so we can now log
# via syslog() directly..