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 807D0138350 for ; Thu, 13 Feb 2020 13:33:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71FBEE087C; Thu, 13 Feb 2020 13:33:25 +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 503ABE087C for ; Thu, 13 Feb 2020 13:33:25 +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 5B93F34ED6B for ; Thu, 13 Feb 2020 13:33:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98C4017 for ; Thu, 13 Feb 2020 13:33:22 +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: <1581600740.679f57ca2e331ef3f8751808989ef8f69b6434fe.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 679f57ca2e331ef3f8751808989ef8f69b6434fe X-VCS-Branch: master Date: Thu, 13 Feb 2020 13:33:22 +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: 8e173fc0-67b1-4da4-bb32-a87e46d3f143 X-Archives-Hash: ba19df356d2bcad372e56bd98c3b849a commit: 679f57ca2e331ef3f8751808989ef8f69b6434fe Author: Michael Gerlach cccfr de> AuthorDate: Thu Feb 13 12:57:19 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Feb 13 13:32:20 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=679f57ca gen_initramfs.sh: append_splash(): Fix splash_geninitramfs error handling Closes: https://bugs.gentoo.org/709478 Signed-off-by: Michael Gerlach cccfr.de> Closes: https://github.com/gentoo/genkernel/pull/13 Signed-off-by: Thomas Deutschmann gentoo.org> gen_initramfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 0ff4759..2ad4e64 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -1014,7 +1014,7 @@ append_splash() { local res_param="" [ -n "${SPLASH_RES}" ] && res_param="-r ${SPLASH_RES}" splash_geninitramfs -c "${TDIR}" ${res_param} ${SPLASH_THEME} \ - | gen_die "Failed to build splash cpio archive" + || gen_die "Failed to build splash cpio archive" if [ -e "/usr/share/splashutils/initrd.splash" ] then