Stop removing lvm/dmsetup from the initramfs (bug #415697)

diff --git a/ChangeLog b/ChangeLog
index 27a3630f60be28a7221721bc391e2734149685c1..8bff2d773a3698d5196a7e7c7ebc024f03c9a50f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  14 May 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  Stop removing lvm/dmsetup from the initramfs (bug #415697), reported by
+  I.zaufi, bug introduced in 9f36ecc125bf2c20bd28c0ad513577a858140a77 affects
+  genkernel >=3.4.30
+
   12 May 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/kernel-config,
   arch/x86_64/kernel-config, defaults/kernel-config:
   Set CONFIG_DEVTMPFS=y on x86, x86_64, default for udev

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 3739fe6f737a22b5c3dc19a4a0e161f2428cfd80..fbcdd447eb5f5600b15b3cbdad2e7e4f749cba6b 100755 (executable)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -292,7 +292,7 @@ append_lvm(){
                # See bug 382555
                mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup ||
                        gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
-               rm -rf  ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,{s,}bin/{lvm,dmsetup}}
+               rm -rfv  ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}
        fi
        if [ -x /sbin/lvm -o -x /bin/lvm ]
        then