| 1 |
commit: fcc197b3b552eacf3d4928ef9cb777ff3d411ddc |
| 2 |
Author: Markus Lidel <Markus.Lidel <AT> shadowconnect <DOT> com> |
| 3 |
AuthorDate: Mon Jan 2 23:21:29 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 2 23:21:29 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fcc197b3 |
| 7 |
|
| 8 |
dmraid: fix booting from a GPT partition on a dmraid. |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
defaults/initrd.scripts | 1 + |
| 13 |
gen_initramfs.sh | 3 +++ |
| 14 |
2 files changed, 4 insertions(+) |
| 15 |
|
| 16 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
| 17 |
index 4b0bbad..31ebeec 100644 |
| 18 |
--- a/defaults/initrd.scripts |
| 19 |
+++ b/defaults/initrd.scripts |
| 20 |
@@ -1002,6 +1002,7 @@ startVolumes() { |
| 21 |
else |
| 22 |
/sbin/dmraid -ay ${DMRAID_OPTS} |
| 23 |
fi |
| 24 |
+ [ -x '/sbin/kpartx' ] && /sbin/dmsetup ls --exec '/sbin/kpartx -a -s' |
| 25 |
fi |
| 26 |
fi |
| 27 |
|
| 28 |
|
| 29 |
diff --git a/gen_initramfs.sh b/gen_initramfs.sh |
| 30 |
index afbef92..10108fb 100755 |
| 31 |
--- a/gen_initramfs.sh |
| 32 |
+++ b/gen_initramfs.sh |
| 33 |
@@ -318,6 +318,9 @@ append_dmraid(){ |
| 34 |
mkdir -p "${TEMP}/initramfs-dmraid-temp/" |
| 35 |
/bin/tar -jxpf "${DMRAID_BINCACHE}" -C "${TEMP}/initramfs-dmraid-temp" || |
| 36 |
gen_die "Could not extract dmraid binary cache!"; |
| 37 |
+ [ -x /sbin/dmsetup -a -x /sbin/kpartx ] && copy_binaries \ |
| 38 |
+ "${TEMP}/initramfs-dmraid-temp/" \ |
| 39 |
+ /sbin/{kpartx,dmsetup} |
| 40 |
cd "${TEMP}/initramfs-dmraid-temp/" |
| 41 |
module_ext=$(modules_kext) |
| 42 |
RAID456=`find . -type f -name raid456${module_ext}` |
Archives