devel/mkinitrd mkinitrd-no-more-lvm-static.patch, NONE, 1.1 mkinitrd.spec, 1.240, 1.241

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/mkinitrd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24747

Modified Files:
	mkinitrd.spec 
Added Files:
	mkinitrd-no-more-lvm-static.patch 
Log Message:
* Sat Jan 19 2008 Jeremy Katz <katzj at redhat.com> - 6.0.28-3
- Don't call lvm.static -- it no longer exists 


mkinitrd-no-more-lvm-static.patch:

--- NEW FILE mkinitrd-no-more-lvm-static.patch ---
commit f4a43e54e2798e57623d78e74148fe06f2a6b940
Author: Jeremy Katz <katzj at redhat.com>
Date:   Sat Jan 19 19:01:07 2008 -0500

    Don't use lvm.static -- it no longer exists

diff --git a/mkinitrd b/mkinitrd
index 45ff1e8..5e41697 100755
--- a/mkinitrd
+++ b/mkinitrd
@@ -740,12 +740,12 @@ handleraid() {
 }
 
 lvshow() {
-    lvm.static lvs --ignorelockingfailure --noheadings -o vg_name \
+    lvm lvs --ignorelockingfailure --noheadings -o vg_name \
         $1 2>/dev/null | egrep -v '^ *(WARNING:|Volume Groups with)'
 }
 
 vgdisplay() {
-    lvm.static vgdisplay --ignorelockingfailure -v $1 2>/dev/null |
+    lvm vgdisplay --ignorelockingfailure -v $1 2>/dev/null |
         sed -n 's/PV Name//p'
 }
 


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/pkgs/devel/mkinitrd/mkinitrd.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- mkinitrd.spec	14 Jan 2008 22:54:02 -0000	1.240
+++ mkinitrd.spec	20 Jan 2008 00:04:11 -0000	1.241
@@ -3,10 +3,11 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.28
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
+Patch0: mkinitrd-no-more-lvm-static.patch
 ExclusiveOs: Linux
 Prereq: dev
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
@@ -65,6 +66,7 @@
 
 %prep
 %setup -q -n mkinitrd-%{version}
+%patch1 -p1
 
 %build
 make LIB=%{_lib}
@@ -112,6 +114,9 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
+* Sat Jan 19 2008 Jeremy Katz <katzj at redhat.com> - 6.0.28-3
+- Don't call lvm.static -- it no longer exists 
+
 * Mon Jan 14 2008 David Cantrell <dcantrell at redhat.com> - 6.0.28-2
 - Rebuild for new libdhcp