| 1 |
commit: fa433b368a95deecfc4215f4aa89445ef199b753 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 28 22:04:31 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 22:10:42 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa433b36 |
| 7 |
|
| 8 |
kernel-install.eclass: Fix bypassing dracut configs |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/kernel-install.eclass | 10 ++++++++-- |
| 13 |
1 file changed, 8 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass |
| 16 |
index b8109f47d0b..965001924e7 100644 |
| 17 |
--- a/eclass/kernel-install.eclass |
| 18 |
+++ b/eclass/kernel-install.eclass |
| 19 |
@@ -211,9 +211,15 @@ kernel-install_test() { |
| 20 |
|
| 21 |
local qemu_arch=$(kernel-install_get_qemu_arch) |
| 22 |
|
| 23 |
+ # NB: if you pass a path that does not exist or is not a regular |
| 24 |
+ # file/directory, dracut will silently ignore it and use the default |
| 25 |
+ # https://github.com/dracutdevs/dracut/issues/1136 |
| 26 |
+ > "${T}"/empty-file || die |
| 27 |
+ mkdir -p "${T}"/empty-directory || die |
| 28 |
+ |
| 29 |
dracut \ |
| 30 |
- --conf /dev/null \ |
| 31 |
- --confdir /dev/null \ |
| 32 |
+ --conf "${T}"/empty-file \ |
| 33 |
+ --confdir "${T}"/empty-directory \ |
| 34 |
--no-hostonly \ |
| 35 |
--kmoddir "${modules}" \ |
| 36 |
"${T}/initrd" "${version}" || die |
Archives