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, 31 Dec 2019 17:25:42
Message-Id: 1577812699.cb705cfd0dc3800a085f5ccba4681b73b1fe2287.whissi@gentoo
1 commit: cb705cfd0dc3800a085f5ccba4681b73b1fe2287
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 31 17:18:19 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 31 17:18:19 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cb705cfd
7
8 gen_initramfs.sh: create_initramfs(): Make ldconfig failure non-fatal
9
10 Having up-to-date /etc/ld.so.cache in initramfs is nice to have but not
11 critical and ldconfig is known to fail when running under sandbox.
12
13 Closes: https://bugs.gentoo.org/704354
14 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
15
16 gen_initramfs.sh | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19 diff --git a/gen_initramfs.sh b/gen_initramfs.sh
20 index 283e308..676b86d 100755
21 --- a/gen_initramfs.sh
22 +++ b/gen_initramfs.sh
23 @@ -1811,7 +1811,7 @@ create_initramfs() {
24 print_info 1 "$(get_indent 1)>> Pre-generating initramfs' /etc/ld.so.cache ..."
25 # Need to disable sandbox which doesn't understand chroot(), bug #431038
26 SANDBOX_ON=0 ldconfig -f /etc/ld.so.conf -r "${TDIR}" 2>/dev/null \
27 - || gen_die "Failed to pre-generate '${TDIR}/etc/ld.so.cache'!"
28 + || print_warning 1 "Failed to pre-generate '${TDIR}/etc/ld.so.cache'! Probably due to sandbox/permission problem; Ignoring ..."
29 fi
30
31 find . -print0 | sort -z | "${CPIO_COMMAND}" ${CPIO_ARGS} --reproducible -F "${CPIO_ARCHIVE}" 2>/dev/null \