Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: /
Date: Tue, 26 Mar 2019 12:38:35
Message-Id: 1553593739.ba8d7607b735d08eede975671edcc1e6d9b37345.whissi@gentoo
1 commit: ba8d7607b735d08eede975671edcc1e6d9b37345
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 26 09:48:59 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 26 09:48:59 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ba8d7607
7
8 create_initramfs(): add error checking sed call which ties to delete CONFIG_INITRAMFS_SOURCE
9
10 Bug: https://bugs.gentoo.org/656944
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 gen_initramfs.sh | 4 +++-
14 1 file changed, 3 insertions(+), 1 deletion(-)
15
16 diff --git a/gen_initramfs.sh b/gen_initramfs.sh
17 index 03e3d59..da5ffcf 100755
18 --- a/gen_initramfs.sh
19 +++ b/gen_initramfs.sh
20 @@ -1110,7 +1110,9 @@ create_initramfs() {
21 # Explicitly do not compress if we are integrating into the kernel.
22 # The kernel will do a better job of it than us.
23 mv ${TMPDIR}/initramfs-${KV} ${TMPDIR}/initramfs-${KV}.cpio
24 - sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' ${KERNEL_OUTPUTDIR}/.config
25 + sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' "${KERNEL_OUTPUTDIR}/.config" ||
26 + gen_die "failed to delete CONFIG_INITRAMFS_SOURCE from '${KERNEL_OUTPUTDIR}/.config'"
27 +
28 compress_config='INITRAMFS_COMPRESSION_NONE'
29 case ${compress_ext} in
30 gz) compress_config='INITRAMFS_COMPRESSION_GZIP' ;;