commit: a6223abe3b87bc544445f1b2ee51019084209181 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Mon Jan 13 00:04:17 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Jan 13 23:36:56 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a6223abe
gen_initramfs.sh: append_splash(): Move check for splash_geninitramfs to determine_real_args() This will allow us to fail early if splash_geninitramfs isn't available. Bug: https://bugs.gentoo.org/705304 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> gen_determineargs.sh | 8 ++++++++ gen_initramfs.sh | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 61521d6..fffb3e9 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -848,6 +848,14 @@ determine_real_args() { gen_die "--multipath requires --lvm but --no-lvm is set!" fi + if isTrue "${SPLASH}" + then + if ! hash splash_geninitramfs &>/dev/null + then + gen_die "splash_geninitramfs is required for --splash but was not found!" + fi + fi + if isTrue "${SSH}" then local ssh_authorized_keys_file=$(expand_file "${SSH_AUTHORIZED_KEYS_FILE}") diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 783d9a7..0ff4759 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -996,11 +996,6 @@ append_splash() { rm -r "${TDIR}" || gen_die "Failed to clean out existing '${TDIR}'!" fi - if ! hash splash_geninitramfs &>/dev/null - then - gen_die "Unable to generate splash, 'splash_geninitramfs' was not found!" - fi - mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!" cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
