From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R3P2Z-0000Zs-FA for garchives@archives.gentoo.org; Tue, 13 Sep 2011 09:12:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93A9521C204; Tue, 13 Sep 2011 09:12:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5525821C204 for ; Tue, 13 Sep 2011 09:12:20 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA23D1B400B for ; Tue, 13 Sep 2011 09:12:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 04C4E80042 for ; Tue, 13 Sep 2011 09:12:19 +0000 (UTC) From: "Fabio Erculiani" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabio Erculiani" Message-ID: <7fef86581a32cc6684f4faf7b174d3f39cec89ee.lxnay@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog gen_compile.sh gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: lxnay X-VCS-Committer-Name: Fabio Erculiani X-VCS-Revision: 7fef86581a32cc6684f4faf7b174d3f39cec89ee Date: Tue, 13 Sep 2011 09:12:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 6c5fd41d55f76c70fb79c0476c3b30b3 commit: 7fef86581a32cc6684f4faf7b174d3f39cec89ee Author: Fabio Erculiani sabayon org> AuthorDate: Tue Sep 13 09:16:17 2011 +0000 Commit: Fabio Erculiani gentoo org> CommitDate: Tue Sep 13 09:16:17 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D7fef8658 dmraid requires dmsetup to assign UUID to discovered RAID volumes, close = bug #382555 --- ChangeLog | 5 +++++ gen_compile.sh | 5 ++++- gen_initramfs.sh | 13 +++++++++++++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbc1418..3814ba6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ # Distributed under the GPL v2 # $Id$ =20 + 13 Sep 2011; Fabio Erculiani gen_compile.sh, + gen_initramfs.sh: + dmraid requires dmsetup to assign UUID to discovered RAID volumes, clo= se bug + #382555 + 11 Sep 2011; Fabio Erculiani defaults/initrd.script= s, defaults/linuxrc: drop parse_opt usage and crufty, deprecated subshelling through=20 diff --git a/gen_compile.sh b/gen_compile.sh index 2f8a71a..045ca8f 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -451,7 +451,10 @@ compile_lvm() { print_info 1 ' >> Copying to bincache...' strip "sbin/lvm.static" || gen_die 'Could not strip lvm.static!' - /bin/tar -cjf "${LVM_BINCACHE}" sbin/lvm.static || + # See bug 382555 + strip "sbin/dmsetup.static" || + gen_die 'Could not strip dmsetup.static' + /bin/tar -cjf "${LVM_BINCACHE}" sbin/lvm.static sbin/dmsetup.static || gen_die 'Could not create binary cache' =20 cd "${TEMP}" diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 5c47fd7..50ddbe5 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -247,11 +247,21 @@ append_lvm(){ print_info 1 ' LVM: Adding support (using local static binary= /sbin/lvm.static)...' cp /sbin/lvm.static "${TEMP}/initramfs-lvm-temp/bin/lvm" || gen_die 'Could not copy over lvm!' + # See bug 382555 + if [ -e '/sbin/dmsetup.static' ] + then + cp /sbin/dmsetup.static "${TEMP}/initramfs-lvm-temp/bin/dmsetup" + fi elif [ -e '/sbin/lvm' ] && LC_ALL=3D"C" ldd /sbin/lvm|grep -q 'not a dy= namic executable' then print_info 1 ' LVM: Adding support (using local static binary= /sbin/lvm)...' cp /sbin/lvm "${TEMP}/initramfs-lvm-temp/bin/lvm" || gen_die 'Could not copy over lvm!' + # See bug 382555 + if [ -e '/sbin/dmsetup' ] && LC_ALL=3D"C" ldd /sbin/dmsetup | grep -q = 'not a dynamic executable' + then + cp /sbin/dmsetup "${TEMP}/initramfs-lvm-temp/bin/dmsetup" + fi else print_info 1 ' LVM: Adding support (compiling binaries)...' compile_lvm @@ -259,6 +269,9 @@ append_lvm(){ gen_die "Could not extract lvm binary cache!"; mv ${TEMP}/initramfs-lvm-temp/sbin/lvm.static ${TEMP}/initramfs-lvm-te= mp/bin/lvm || gen_die 'LVM error: Could not move lvm.static to lvm!' + # See bug 382555 + mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lv= m-temp/bin/dmsetup || + gen_die 'LVM error: Could not move dmsetup.static to dmsetup!' fi if [ -x /sbin/lvm ] then