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 0871A138335 for ; Wed, 7 Aug 2019 15:46:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4238FE0887; Wed, 7 Aug 2019 15:46:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2BEE4E0887 for ; Wed, 7 Aug 2019 15:46:13 +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 13DAE3494AB for ; Wed, 7 Aug 2019 15:46:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7FC4757 for ; Wed, 7 Aug 2019 15:46:09 +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: <1565124031.b54d7057a3ea2d192275d3376e891a6ead8872c3.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts defaults/linuxrc defaults/login-remote.sh defaults/unlock-luks.sh X-VCS-Directories: defaults/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: b54d7057a3ea2d192275d3376e891a6ead8872c3 X-VCS-Branch: master Date: Wed, 7 Aug 2019 15:46:09 +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: 4b15459d-aef4-40e6-a944-4de7b9cfe69d X-Archives-Hash: cd100c54f8a5f4bbb1605c71e8be8454 commit: b54d7057a3ea2d192275d3376e891a6ead8872c3 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Aug 5 13:51:57 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Aug 6 20:40:31 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b54d7057 initrd.scripts: Move splash() function to initrd.scripts Signed-off-by: Thomas Deutschmann gentoo.org> defaults/initrd.scripts | 4 ++++ defaults/linuxrc | 4 ---- defaults/login-remote.sh | 4 ---- defaults/unlock-luks.sh | 4 ---- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index f27c02f..1f7dc94 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1152,6 +1152,10 @@ waitForZFS() { exit 1 } +splash() { + return 0 +} + start_volumes() { # Here, we check for /dev/device-mapper, and if it exists, we setup a # a symlink, which should hopefully fix bug #142775 and bug #147015 diff --git a/defaults/linuxrc b/defaults/linuxrc index e21e555..d729806 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -3,10 +3,6 @@ . /etc/initrd.defaults . /etc/initrd.scripts -splash() { - return 0 -} - [ -e /etc/initrd.splash ] && . /etc/initrd.splash # Basic /dev content, we need it as fast as possible. diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh index f8c4d08..ca85b06 100644 --- a/defaults/login-remote.sh +++ b/defaults/login-remote.sh @@ -5,10 +5,6 @@ . /etc/initrd.scripts . "${CRYPT_ENV_FILE}" -splash() { - return 0 -} - [ -e /etc/initrd.splash ] && . /etc/initrd.splash receivefile() { diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh index ef6b816..cae5269 100644 --- a/defaults/unlock-luks.sh +++ b/defaults/unlock-luks.sh @@ -4,10 +4,6 @@ print_usage() { echo "Usage: $0 root|swap" >&2 } -splash() { - return 0 -} - if [ -z "${1}" ] then print_usage