From 458f76adeeb388958f42b98fc4d65c2ce8a5dafb Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 22 Feb 2011 18:42:29 +0100 Subject: [PATCH] - fixed lvm version parsing --- ...lvm-lvm_scan.sh-removed-garbage-line.patch | 21 +++++++++++++++++++ dracut.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 0016-90lvm-lvm_scan.sh-removed-garbage-line.patch diff --git a/0016-90lvm-lvm_scan.sh-removed-garbage-line.patch b/0016-90lvm-lvm_scan.sh-removed-garbage-line.patch new file mode 100644 index 0000000..4af7a8c --- /dev/null +++ b/0016-90lvm-lvm_scan.sh-removed-garbage-line.patch @@ -0,0 +1,21 @@ +From 2826a877afe74eef6e5ba35e78eddf77107c3d01 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 22 Feb 2011 18:40:40 +0100 +Subject: [PATCH] 90lvm/lvm_scan.sh: removed garbage line + +--- + modules.d/90lvm/lvm_scan.sh | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh +index 9f9ce92..7573615 100755 +--- a/modules.d/90lvm/lvm_scan.sh ++++ b/modules.d/90lvm/lvm_scan.sh +@@ -63,7 +63,6 @@ OLDIFS=$IFS + IFS=. + set $(lvm version 2>/dev/null) + IFS=$OLDIFS +-maj min sub + maj=${1##*:} + min=$2 + sub=${3%% *} diff --git a/dracut.spec b/dracut.spec index 3d49459..923abcc 100644 --- a/dracut.spec +++ b/dracut.spec @@ -8,7 +8,7 @@ Name: dracut Version: 008 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} @@ -97,6 +97,7 @@ Patch12: 0012-init-set-cdrom-polling-in-kernel.patch Patch13: 0013-fix-c0a82e271e2730159f042ee7d7fc4aca2e08d28a.patch Patch14: 0014-vconsole.font.unicode-vconsole.unicode.patch Patch15: 0015-90lvm-lvm_scan.sh-fixed-lvm-version-parsing.patch +Patch16: 0016-90lvm-lvm_scan.sh-removed-garbage-line.patch %description Dracut contains tools to create a bootable initramfs for 2.6 Linux kernels. @@ -175,6 +176,7 @@ This package contains tools to assemble the local initrd and host configuration. %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build make WITH_SWITCH_ROOT=0%{?with_switch_root} @@ -299,6 +301,9 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/dracut/overlay %changelog +* Tue Feb 22 2011 Harald Hoyer 008-7 +- fixed lvm version parsing + * Tue Feb 22 2011 Harald Hoyer 008-6 - fixed lvm version parsing