From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 22770138350 for ; Tue, 14 Jan 2020 01:36:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0188E09C8; Tue, 14 Jan 2020 01:36:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8150DE09B4 for ; Tue, 14 Jan 2020 01:36:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8AF3A34E054 for ; Tue, 14 Jan 2020 01:36:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94F31B0 for ; Tue, 14 Jan 2020 01:36:26 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1578958616.a6223abe3b87bc544445f1b2ee51019084209181.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_determineargs.sh gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: a6223abe3b87bc544445f1b2ee51019084209181 X-VCS-Branch: master Date: Tue, 14 Jan 2020 01:36:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5b6746ee-f2c0-4f88-b082-cbf90f3c8f6b X-Archives-Hash: 8f61a9984ae9dfa542ec4dea181ba79c commit: a6223abe3b87bc544445f1b2ee51019084209181 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Jan 13 00:04:17 2020 +0000 Commit: Thomas Deutschmann gentoo 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 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}'!"