[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     4ddc6b5da63a9a63acfd958f5b0c2a00cd238c0d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 21:57:48 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 16:01:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4ddc6b5d

gen_initramfs.sh: create_initramfs(): Move lddtree functional test to 
determine_real_args()

This will allow us to bail out early in case lddtree isn't working.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh | 10 ++++++++++
 gen_initramfs.sh     |  7 -------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 72741fc..52de7a3 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -517,6 +517,16 @@ determine_real_args() {
                        done
                        unset FEATURE_REQUIRING_BUSYBOX 
FEATURES_REQUIRING_BUSYBOX
                fi
+
+               local lddtree_testfile=$(which cpio 2>/dev/null)
+               if [[ -z "${lddtree_testfile}" || ! -e "${lddtree_testfile}" ]]
+               then
+                       # This will be fatal because we cpio either way
+                       gen_die "cpio binary not found. Is app-arch/cpio 
installed?"
+               elif ! lddtree -l "${lddtree_testfile}" 1>/dev/null 2>&1
+               then
+                       gen_die "'lddtree -l ${lddtree_testfile}' failed -- 
cannot generate initramfs without working lddtree!"
+               fi
        fi
 
        MICROCODE=${MICROCODE,,}

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index c9c1253..08a65e2 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1526,13 +1526,6 @@ append_data() {
 }
 
 create_initramfs() {
-       local lddtree_testfile=$(which cpio 2>/dev/null)
-       if [[ -z "${lddtree_testfile}" || ! -e "${lddtree_testfile}" ]]; then
-               print_warning 1 "cpio binary not found -- cannot check if 
lddtree is working!"
-       elif ! lddtree "${lddtree_testfile}" 1>/dev/null 2>&1; then
-               gen_die "'lddtree ${lddtree_testfile}' failed -- cannot 
generate initramfs without working lddtree!"
-       fi
-
        local compress_ext=""
        print_info 1 "initramfs: >> Initializing ..."