From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58E72139087 for ; Mon, 2 Jan 2017 23:25:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B897E0D3F; Mon, 2 Jan 2017 23:25:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2570AE0C9C for ; Mon, 2 Jan 2017 23:25:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 077C134108B for ; Mon, 2 Jan 2017 23:25:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45E0E260F for ; Mon, 2 Jan 2017 23:25:53 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1483399289.fcc197b3b552eacf3d4928ef9cb777ff3d411ddc.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts gen_initramfs.sh X-VCS-Directories: defaults/ / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: fcc197b3b552eacf3d4928ef9cb777ff3d411ddc X-VCS-Branch: master Date: Mon, 2 Jan 2017 23:25:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 15b7da81-4a50-42d1-a110-85309ff8c39b X-Archives-Hash: a75d145bc6f639438977e7d0c07cb393 commit: fcc197b3b552eacf3d4928ef9cb777ff3d411ddc Author: Markus Lidel shadowconnect com> AuthorDate: Mon Jan 2 23:21:29 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Jan 2 23:21:29 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fcc197b3 dmraid: fix booting from a GPT partition on a dmraid. Signed-off-by: Robin H. Johnson gentoo.org> defaults/initrd.scripts | 1 + gen_initramfs.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 4b0bbad..31ebeec 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1002,6 +1002,7 @@ startVolumes() { else /sbin/dmraid -ay ${DMRAID_OPTS} fi + [ -x '/sbin/kpartx' ] && /sbin/dmsetup ls --exec '/sbin/kpartx -a -s' fi fi diff --git a/gen_initramfs.sh b/gen_initramfs.sh index afbef92..10108fb 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -318,6 +318,9 @@ append_dmraid(){ mkdir -p "${TEMP}/initramfs-dmraid-temp/" /bin/tar -jxpf "${DMRAID_BINCACHE}" -C "${TEMP}/initramfs-dmraid-temp" || gen_die "Could not extract dmraid binary cache!"; + [ -x /sbin/dmsetup -a -x /sbin/kpartx ] && copy_binaries \ + "${TEMP}/initramfs-dmraid-temp/" \ + /sbin/{kpartx,dmsetup} cd "${TEMP}/initramfs-dmraid-temp/" module_ext=$(modules_kext) RAID456=`find . -type f -name raid456${module_ext}`