r2969 - in trunk/utils/initrd-tools: . debian

[Steve Langasek]

Author: vorlon
Date: 2005-04-10 22:42:42 +0000 (Sun, 10 Apr 2005)
New Revision: 2969

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/mkinitrd
Log:
debian/changelog: Update.
mkinitrd: improve heuristics for lvm2 vs. lvm10 selection
Closes: 291386



Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-04-10 21:37:30 UTC (rev 2968)
+++ trunk/utils/initrd-tools/debian/changelog	2005-04-10 22:42:42 UTC (rev 2969)
@@ -1,3 +1,13 @@
+initrd-tools (0.1.79) unstable; urgency=high
+
+  * Steve Langasek
+    - Don't be so hasty to use lvm10: only use it if lvmiopversion
+      says we're lvm10-only, *or* there's no dm-mod for the kernel;
+      this avoids breaking lvm2 volumes in 2.4 when the lvm10 package
+      is installed.  Closes: #291386.
+
+ -- Steve Langasek <vorlon@debian.org>  Sun, 10 Apr 2005 15:38:08 -0700
+
 initrd-tools (0.1.78) unstable; urgency=high
 
   * Bastian Blank

Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2005-04-10 21:37:30 UTC (rev 2968)
+++ trunk/utils/initrd-tools/mkinitrd	2005-04-10 22:42:42 UTC (rev 2969)
@@ -266,7 +266,8 @@
 	fi
 	LVM=yes
 
-	if module_exists drivers/md/lvm-mod && [ -d /lib/lvm-10 ]; then
+	if ([ "$iopver" -lt 200 ] || ! module_exists drivers/md/dm-mod) \
+	   && module_exists drivers/md/lvm-mod && [ -d /lib/lvm-10 ]; then
 		echo lvm-mod
 		echo /dev/lvm >&4
 		{