* [gentoo-commits] proj/genkernel:bug642988 commit in: /
@ 2019-03-21 22:56 Thomas Deutschmann
2019-03-21 23:51 ` [gentoo-commits] proj/genkernel:master " Thomas Deutschmann
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Deutschmann @ 2019-03-21 22:56 UTC (permalink / raw
To: gentoo-commits
commit: 02e67d4860b6a6fd3e9b23e18f757adfd3d62bed
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 22:55:48 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 22:55:48 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=02e67d48
create_initramfs(): Add check for CONFIG_FILE_LOCKING=y when LVM is used
Closes: https://bugs.gentoo.org/673590
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
gen_initramfs.sh | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index a0c7601..50315cb 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1080,6 +1080,12 @@ create_initramfs() {
local CONFGREP=grep
fi
+ if isTrue "${LVM}" ; then
+ if ! ${CONFGREP} -q "^CONFIG_FILE_LOCKING=y" "${ACTUAL_KERNEL_CONFIG}" ; then
+ gen_die "LVM will require a kernel with CONFIG_FILE_LOCKING=y set!"
+ fi
+ fi
+
if isTrue "${INTEGRATED_INITRAMFS}"
then
# Explicitly do not compress if we are integrating into the kernel.
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/genkernel:bug642988 commit in: /
@ 2019-03-21 22:56 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2019-03-21 22:56 UTC (permalink / raw
To: gentoo-commits
commit: 919cbc4b10215b54fb7b1c74b11ea25534243608
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 22:41:06 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 22:41:06 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=919cbc4b
create_initramfs(): Move ACTUAL_KERNEL_CONFIG block
This will allow us to do additional kernel config checks.
Bug: https://bugs.gentoo.org/673590
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
gen_initramfs.sh | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 175ccc5..a0c7601 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1065,6 +1065,21 @@ create_initramfs() {
cd "${TEMP}"
+ # NOTE: We do not work with ${KERNEL_CONFIG} here, since things like
+ # "make oldconfig" or --noclean could be in effect.
+ if [ -f "${KERNEL_OUTPUTDIR}"/.config ]; then
+ local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}"/.config
+ else
+ local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
+ fi
+
+ if [[ "$(file --brief --mime-type "${ACTUAL_KERNEL_CONFIG}")" == application/x-gzip ]]; then
+ # Support --kernel-config=/proc/config.gz, mainly
+ local CONFGREP=zgrep
+ else
+ local CONFGREP=grep
+ fi
+
if isTrue "${INTEGRATED_INITRAMFS}"
then
# Explicitly do not compress if we are integrating into the kernel.
@@ -1099,21 +1114,6 @@ create_initramfs() {
else
if isTrue "${COMPRESS_INITRD}"
then
- # NOTE: We do not work with ${KERNEL_CONFIG} here, since things like
- # "make oldconfig" or --noclean could be in effect.
- if [ -f "${KERNEL_OUTPUTDIR}"/.config ]; then
- local ACTUAL_KERNEL_CONFIG="${KERNEL_OUTPUTDIR}"/.config
- else
- local ACTUAL_KERNEL_CONFIG="${KERNEL_CONFIG}"
- fi
-
- if [[ "$(file --brief --mime-type "${ACTUAL_KERNEL_CONFIG}")" == application/x-gzip ]]; then
- # Support --kernel-config=/proc/config.gz, mainly
- local CONFGREP=zgrep
- else
- local CONFGREP=grep
- fi
-
cmd_xz=$(type -p xz)
cmd_lzma=$(type -p lzma)
cmd_bzip2=$(type -p bzip2)
@@ -1177,6 +1177,7 @@ create_initramfs() {
print_info 1 "$(getIndent 1)>> Not compressing cpio data ..."
fi
fi
+
## To early load microcode we need to follow some pretty specific steps
## mostly laid out in linux/Documentation/x86/early-microcode.txt
## It only loads monolithic ucode from an uncompressed cpio, which MUST
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-03-21 23:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-21 22:56 [gentoo-commits] proj/genkernel:bug642988 commit in: / Thomas Deutschmann
2019-03-21 23:51 ` [gentoo-commits] proj/genkernel:master " Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2019-03-21 22:56 [gentoo-commits] proj/genkernel:bug642988 " Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox