commit: fcc197b3b552eacf3d4928ef9cb777ff3d411ddc Author: Markus Lidel <Markus.Lidel <AT> shadowconnect <DOT> com> AuthorDate: Mon Jan 2 23:21:29 2017 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> 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 <robbat2 <AT> 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}`