From 4b413a547ba4303ee826b4da00e9e48b85daf637 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 16 Apr 2004 07:31:10 +0000
Subject: lvm fixes (#120458, #119975)

---
 rc.d/rc.sysinit | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'rc.d/rc.sysinit')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 30b135f6..717d1002 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -375,15 +375,15 @@ state=`awk '/ \/ / && ($3 !~ /rootfs/) { print $4 }' /proc/mounts`
   action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw /
 
 # LVM2 initialization
-if [ -d /etc/lvm/ -a -x /sbin/lvm ]; then
+if [ -x /sbin/lvm.static ]; then
     if ! LC_ALL=C fgrep -q "device-mapper" /proc/devices 2>/dev/null ; then
 	modprobe dm-mod >/dev/null 2>&1
     fi
     /bin/rm -f /dev/mapper/control
     echo "mkdmnod" | /sbin/nash --quiet >/dev/null 2>&1
     [ -n "$SELINUX" ] && restorecon /dev/mapper/control
-    if [ -e /dev/mapper/control -a -x /sbin/lvm ]; then
-	action $"Setting up Logical Volume Management:" /sbin/lvm vgscan --mknodes && /sbin/lvm vgchange -a y
+    if [ -e /dev/mapper/control -a -x /sbin/lvm.static ]; then
+	action $"Setting up Logical Volume Management:" /sbin/lvm.static vgscan && /sbin/lvm.static vgchange -a y && /sbin/lvm vgmknodes
     fi
 fi
 # LVM initialization
@@ -542,8 +542,8 @@ if [ -f /etc/raidtab ]; then
 		reboot -f
 	fi
 	# LVM2 initialization, take 2
-	if [ -f /dev/mapper/control -a -x /sbin/lvm -a -d /etc/lvm ]; then
-		action $"Setting up Logical Volume Management:" /sbin/lvm vgscan --mknodes && /sbin/lvm vgchange -a y
+	if [ -f /dev/mapper/control -a -x /sbin/lvm.static ]; then
+		action $"Setting up Logical Volume Management:" /sbin/lvm.static vgscan --mknodes && /sbin/lvm.static vgchange -a y
 	fi
 	# LVM initialization, take 2 (it could be on top of RAID)
 	if [ -e /proc/lvm -a -x /sbin/vgchange -a -f /etc/lvmtab ]; then
-- 
cgit v1.2.1