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

[Thomas Deutschmann]

commit:     b54d7057a3ea2d192275d3376e891a6ead8872c3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  5 13:51:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> 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 <whissi <AT> 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