- use new evms_activate utility; drop support for evms < 2.0.0

svn-id: @1061

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index f65aa1340244325f907b2dfbaecadeba0b4a58e8..4c9e90d19fa202d4b950399404265d54a24fca44 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # /etc/rc.d/rc.sysinit - run once at boot time
-# $Id: rc.sysinit,v 1.113 2003/04/07 19:59:48 misiek Exp $
+# $Id: rc.sysinit,v 1.114 2003/04/10 07:37:41 misiek Exp $
 #
 # Taken in part from Miquel van Smoorenburg's bcheckrc.
 # Changes:     Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
@@ -386,7 +386,7 @@ fi
 
 # Find and activate volume groups:
 # EVMS
-if [ -x /sbin/evms_rediscover -a -x /sbin/evms_devnode_fixup ]; then
+if [ -x /sbin/evms_activate ]; then
        # Linux 2.5 core module
         modprobe -s -k evmscore > /dev/null 2>&1
        # Linux 2.4 core modules
@@ -398,10 +398,7 @@ if [ -x /sbin/evms_rediscover -a -x /sbin/evms_devnode_fixup ]; then
        is_yes "$EVMS_LVM" && modprobe -s -k lvm_vge >/dev/null 2>&1
        is_yes "$EVMS_AIX" && modprobe -s -k AIXlvm_vge >/dev/null 2>&1
        is_yes "$EVMS_OS2" && modprobe -s -k os2lvm_vge >/dev/null 2>&1
-        run_cmd "Discovering EVMS volumes" /sbin/evms_rediscover
-        if [ ! -e /dev/.devfsd ]; then
-            run_cmd "Fixing /dev for EVMS" /sbin/evms_devnode_fixup
-        fi
+        run_cmd "Discovering EVMS volumes" /sbin/evms_activate
        if is_yes "$EVMS_LVM" && is_yes "$EVMS_LVM_COMPAT_NODES" ; then
                # Link nodes for compatibility with LVM
                if [ "echo /dev/evms/lvm/*" != '/dev/evms/lvm/*' ] ; then