diff options
author | Judd Vinet <judd@archlinux.org> | 2004-07-16 00:27:57 +0000 |
---|---|---|
committer | Judd Vinet <judd@archlinux.org> | 2004-07-16 00:27:57 +0000 |
commit | 3280eeff177ecf79c32213303c9eb320b579d040 (patch) | |
tree | 919982ceadb85c91937adb61674915261be755dd | |
parent | 2c20f4d5637da88e983b65db9c97373aa79d8a37 (diff) | |
download | initscripts-3280eeff177ecf79c32213303c9eb320b579d040.tar.xz |
updated version header to 0.7, added support for udev and static /dev trees
-rw-r--r-- | rc.conf | 2 | ||||
-rwxr-xr-x | rc.shutdown | 12 | ||||
-rwxr-xr-x | rc.sysinit | 24 |
3 files changed, 22 insertions, 16 deletions
@@ -54,6 +54,6 @@ ROUTES=(!gateway) # Daemons to start at boot-up (in this order) # (prefix a daemon with a ! to disable it) # -DAEMONS=(syslogd klogd !hotplug !pcmcia network netfs crond) +DAEMONS=(syslogd klogd hotplug !pcmcia network netfs crond) # End of file diff --git a/rc.shutdown b/rc.shutdown index e536aae..8e5a0e9 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -70,11 +70,13 @@ if [ "$USELVM" = "yes" -o "$USELVM" = "YES" ]; then /sbin/vgchange -a n stat_done elif [ -d /etc/lvm -a -x /sbin/lvm ]; then - /bin/mount -n -t sysfs none /sys - stat_busy "Deactivating LVM2 groups" - /sbin/lvm vgchange --ignorelockingfailure -a n - stat_done - umount /sys + /bin/mount -n -t sysfs none /sys 2>/dev/null + if [ -d /sys/block ]; then + stat_busy "Deactivating LVM2 groups" + /sbin/lvm vgchange --ignorelockingfailure -a n + stat_done + umount /sys + fi fi fi @@ -7,7 +7,7 @@ . /etc/rc.d/functions echo " " -printhl "Arch Linux v0.6 $C_OTHER(${C_H2}Widget$C_OTHER)\n" +printhl "Arch Linux v0.7 $C_OTHER(${C_H2}Wombat$C_OTHER)\n" printhl "${C_H2}http://www.archlinux.org" printhl "Copyright 2002-2004 Judd Vinet" printhl "Distributed under the GNU General Public License (GPL)" @@ -19,27 +19,32 @@ printsep # anything more serious than KERN_WARNING goes to the console /bin/dmesg -n 3 +# mount /proc and /sys +mount -n -t sysfs none /sys 2>/dev/null +mount -n -t proc none /proc + if [ -e /dev/.devfsd -a -x /sbin/devfsd ]; then + # Looks like devfs is running, use it status "Starting DevFS Daemon" /sbin/devfsd /dev +elif [ -x /etc/start_udev -a -d /sys/block ]; then + # We have a start_udev script and /sys appears to be mounted, use UDev + status "Starting UDev Daemon" /etc/start_udev +else + # Static /dev, our last resort + status "Using static /dev filesystem" /bin/true fi if [ "$USELVM" = "yes" -o "$USELVM" = "YES" ]; then if [ -f /etc/lvmtab -a -x /sbin/vgchange ]; then # Kernel 2.4.x, LVM1 groups - /bin/mount -n -t proc none /proc stat_busy "Activating LVM1 groups" /sbin/vgchange -a y stat_done - umount /proc - elif [ -x /sbin/lvm ]; then + elif [ -x /sbin/lvm -a -d /sys/block ]; then # Kernel 2.6.x, LVM2 groups - /bin/mount -n -t proc none /proc - /bin/mount -n -t sysfs none /sys stat_busy "Activating LVM2 groups" /sbin/lvm vgchange --ignorelockingfailure -a y stat_done - umount /proc - umount /sys fi fi @@ -76,8 +81,7 @@ fi stat_busy "Mounting Local Filesystems" /bin/mount -n -o remount,rw / /bin/rm -f /etc/mtab* -/bin/mount /proc -/bin/mount -a -t nonfs,nosmbfs,noncpfs +/bin/mount -a -t nonfs,nosmbfs,noncpfs,nosysfs stat_done stat_busy "Configuring System Clock" |