From b4306a3ede324f6bdbfa5c7b80d0cff15f22c1be Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Wed, 7 Jun 2006 16:49:32 +0000 Subject: 'upgpkg: removed kernel24 stuff eg. devfsd support and lvm1' --- rc.conf | 2 +- rc.shutdown | 6 +----- rc.sysinit | 10 +--------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/rc.conf b/rc.conf index 64c66f1..3475abe 100644 --- a/rc.conf +++ b/rc.conf @@ -83,7 +83,7 @@ ROUTES=(!gateway) # - prefix a daemon with a ! to disable it # - prefix a daemon with a @ to start it up in the background # -DAEMONS=(syslog-ng !hotplug !pcmcia network netfs crond) +DAEMONS=(syslog-ng network netfs crond) # End of file diff --git a/rc.shutdown b/rc.shutdown index ca4edc9..4b3105d 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -69,11 +69,7 @@ stat_busy "Unmounting Filesystems" stat_done if [ "$USELVM" = "yes" -o "$USELVM" = "YES" ]; then - if [ -f /etc/lvmtab -a -x /sbin/vgchange ]; then - stat_busy "Deactivating LVM1 groups" - /sbin/vgchange -a n - stat_done - elif [ -d /etc/lvm -a -x /sbin/lvm ]; then + if [ -d /etc/lvm -a -x /sbin/lvm ]; then /bin/mount -n -t sysfs none /sys 2>/dev/null if [ -d /sys/block ]; then stat_busy "Deactivating LVM2 groups" diff --git a/rc.sysinit b/rc.sysinit index fc6f063..3877cae 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -22,12 +22,8 @@ printsep # mount /proc and /sys mount -n -t proc none /proc [ "`grep sysfs /proc/filesystems`" ] && mount -n -t sysfs none /sys - -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 +if [ -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 init else @@ -260,10 +256,6 @@ if [ "$CONSOLEFONT" != "" ]; then stat_done fi -# Load USB support -/sbin/modprobe usbcore >/dev/null 2>&1 -[ "`grep usbfs /proc/filesystems`" ] && mount -t usbfs none /proc/bus/usb - # Screen blanks after 15 minutes idle time /usr/bin/setterm -blank 15 -- cgit v1.2.3