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 1SJF9o-000866-7i for garchives@archives.gentoo.org; Sun, 15 Apr 2012 02:25:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C942CE0AFD; Sun, 15 Apr 2012 02:25:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9B7CDE0AFD for ; Sun, 15 Apr 2012 02:25:31 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 074EC1B4053 for ; Sun, 15 Apr 2012 02:25:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A217DE5402 for ; Sun, 15 Apr 2012 02:25:28 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1334456654.9f36ecc125bf2c20bd28c0ad513577a858140a77.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 9f36ecc125bf2c20bd28c0ad513577a858140a77 X-VCS-Branch: master Date: Sun, 15 Apr 2012 02:25:28 +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: 7183e7ec-376e-44b5-9833-97df6a82acd9 X-Archives-Hash: a777a7da4b1bc1cd1f6bc2f41885360e commit: 9f36ecc125bf2c20bd28c0ad513577a858140a77 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Apr 15 02:13:37 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Apr 15 02:24:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D9f36ecc1 Handle other possible paths for LVM. Signed-off-by: Robin H. Johnson gentoo.org> --- ChangeLog | 3 +++ gen_initramfs.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5de0eff..f75e034 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ # Distributed under the GPL v2 # $Id$ =20 + 14 Apr 2012; Robin H. Johnson gen_initramfs.sh: + Handle other binary paths for LVM. + 09 Apr 2012; Sebastian Pipping defaults/initrd.scri= pts, defaults/keymaps/keymapList, defaults/keymaps/sf.map: Add keymap "sf" from Pentoo diff --git a/gen_initramfs.sh b/gen_initramfs.sh index f3c14c2..f178b2d 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -265,9 +265,9 @@ append_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!' - rm -rf ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dm= setup}} + rm -rf ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,{s,}bin/{lvm= ,dmsetup}} fi - if [ -x /sbin/lvm ] + if [ -x /sbin/lvm -o -x /bin/lvm ] then # lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.c= onf!' # ret=3D$?