[patch] lvm2-69595.patch

lvm2-69595.patch (text/plain), 1.89 KB, created by SpanKY on 2004-12-03 09:09:00 UTC

Index: init.d/checkfs
===================================================================
RCS file: /var/cvsroot/gentoo-src/rc-scripts/init.d/checkfs,v
retrieving revision 1.42
diff -u -r1.42 checkfs
--- init.d/checkfs	3 Oct 2004 00:37:54 -0000	1.42
+++ init.d/checkfs	3 Dec 2004 17:07:49 -0000
@@ -162,21 +162,25 @@
 	# This should be done *before* checking local
 	# volumes, or they never get checked.
 
-	# NOTE: Add needed modules for LVM or RAID, etc
-	#       to /etc/modules.autoload if needed
-
-	if [ -z "${CDBOOT}" -a -x /sbin/vgscan ] && \
-	   [ -d /proc/lvm -o "$(grep device-mapper /proc/misc 2>/dev/null)" ]
+	if [ -z "${CDBOOT}" -a -x /sbin/vgscan ]
 	then
-		ebegin "Setting up the Logical Volume Manager"
-		#still echo stderr for debugging
-		/sbin/vgscan >/dev/null
-		if [ "$?" -eq 0 ] && [ -x /sbin/vgchange ] && \
-		   [ -f /etc/lvmtab -o -d /etc/lvm ]
+		if [ -e /proc/modules ] && \
+		   ! grep -qs 'device-mapper' /proc/{devices,misc} ; then
+			modprobe dm-mod &>/dev/null
+		fi
+
+		if [ -d /proc/lvm ] || grep -qs 'device-mapper' /proc/{devices,misc}
 		then
-			/sbin/vgchange -a y >/dev/null
+			ebegin "Setting up the Logical Volume Manager"
+			#still echo stderr for debugging
+			/sbin/vgscan >/dev/null
+			if [ "$?" -eq 0 ] && [ -x /sbin/vgchange ] && \
+			   [ -f /etc/lvmtab -o -d /etc/lvm ]
+			then
+				/sbin/vgchange -a y >/dev/null
+			fi
+			eend $? "Failed to setup the LVM"
 		fi
-		eend $? "Failed to setup the LVM"
 	fi
 
 	dm-crypt-start
@@ -217,7 +221,12 @@
 	local cryptfs_status=0 
 	local mountline mount swap options pre_mount post_mount source
 
-	if [ -f /etc/conf.d/cryptfs ] && [ -x /bin/cryptsetup ]; then
+	if [ -f /etc/conf.d/cryptfs ] && [ -x /bin/cryptsetup ] ; then
+		if [ -e /proc/modules ] && \
+		   ! grep -qs 'device-mapper' /proc/{devices,misc} ; then
+			modprobe dm-mod &>/dev/null
+		fi
+
 		ebegin "Setting up dm-crypt mappings"
 
 		while read mountline; do