--- rc.sysinit.orig	2005-12-08 22:14:04 +0200
+++ rc.sysinit.orig	2005-12-08 22:15:10 +0200
@@ -304,10 +304,10 @@ 
 # Activate LVM
 VGSCAN=/sbin/vgscan
 VGCHANGE=/sbin/vgchange
-if [ -e "$VGCHANGE" -a -e "$VGSCAN" -a -s /etc/lvmtab ]; then
+if [ -e "$VGCHANGE" -a -e "$VGSCAN" ] && [ -a -s /etc/lvmtab -o /etc/lvm.d ]; then
 	modprobe lvm-mod >/dev/null 2>&1
 	# for 2.4.x kernel and LVM1 binaris
-	if [ -d /proc/lvm -a ! -c /dev/mapper/control -a ! -x /sbin/lvm ]; then
+	if [ -d /proc/lvm -a ! -c /dev/mapper/control -a ! -x $VGCHANGE.lvm1 ]; then
 		"$VGSCAN" >/dev/null 2>&1
 		action "Setting up LVM:" "$VGCHANGE" -a y
 	fi