From: Sebastian Pipping Date: Mon, 14 May 2012 00:14:13 +0000 (+0200) Subject: Stop removing lvm/dmsetup from the initramfs (bug #415697) X-Git-Tag: v3.4.32~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9743f8b39c6050746d7ff1949fc98999a847c4f9;p=genkernel.git Stop removing lvm/dmsetup from the initramfs (bug #415697) --- diff --git a/ChangeLog b/ChangeLog index 27a3630..8bff2d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ # Distributed under the GPL v2 # $Id$ + 14 May 2012; Sebastian Pipping 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 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 3739fe6..fbcdd44 100755 --- 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