| 1 |
commit: b54d7057a3ea2d192275d3376e891a6ead8872c3 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 5 13:51:57 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 6 20:40:31 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b54d7057 |
| 7 |
|
| 8 |
initrd.scripts: Move splash() function to initrd.scripts |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
|
| 12 |
defaults/initrd.scripts | 4 ++++ |
| 13 |
defaults/linuxrc | 4 ---- |
| 14 |
defaults/login-remote.sh | 4 ---- |
| 15 |
defaults/unlock-luks.sh | 4 ---- |
| 16 |
4 files changed, 4 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
| 19 |
index f27c02f..1f7dc94 100644 |
| 20 |
--- a/defaults/initrd.scripts |
| 21 |
+++ b/defaults/initrd.scripts |
| 22 |
@@ -1152,6 +1152,10 @@ waitForZFS() { |
| 23 |
exit 1 |
| 24 |
} |
| 25 |
|
| 26 |
+splash() { |
| 27 |
+ return 0 |
| 28 |
+} |
| 29 |
+ |
| 30 |
start_volumes() { |
| 31 |
# Here, we check for /dev/device-mapper, and if it exists, we setup a |
| 32 |
# a symlink, which should hopefully fix bug #142775 and bug #147015 |
| 33 |
|
| 34 |
diff --git a/defaults/linuxrc b/defaults/linuxrc |
| 35 |
index e21e555..d729806 100644 |
| 36 |
--- a/defaults/linuxrc |
| 37 |
+++ b/defaults/linuxrc |
| 38 |
@@ -3,10 +3,6 @@ |
| 39 |
. /etc/initrd.defaults |
| 40 |
. /etc/initrd.scripts |
| 41 |
|
| 42 |
-splash() { |
| 43 |
- return 0 |
| 44 |
-} |
| 45 |
- |
| 46 |
[ -e /etc/initrd.splash ] && . /etc/initrd.splash |
| 47 |
|
| 48 |
# Basic /dev content, we need it as fast as possible. |
| 49 |
|
| 50 |
diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh |
| 51 |
index f8c4d08..ca85b06 100644 |
| 52 |
--- a/defaults/login-remote.sh |
| 53 |
+++ b/defaults/login-remote.sh |
| 54 |
@@ -5,10 +5,6 @@ |
| 55 |
. /etc/initrd.scripts |
| 56 |
. "${CRYPT_ENV_FILE}" |
| 57 |
|
| 58 |
-splash() { |
| 59 |
- return 0 |
| 60 |
-} |
| 61 |
- |
| 62 |
[ -e /etc/initrd.splash ] && . /etc/initrd.splash |
| 63 |
|
| 64 |
receivefile() { |
| 65 |
|
| 66 |
diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh |
| 67 |
index ef6b816..cae5269 100644 |
| 68 |
--- a/defaults/unlock-luks.sh |
| 69 |
+++ b/defaults/unlock-luks.sh |
| 70 |
@@ -4,10 +4,6 @@ print_usage() { |
| 71 |
echo "Usage: $0 root|swap" >&2 |
| 72 |
} |
| 73 |
|
| 74 |
-splash() { |
| 75 |
- return 0 |
| 76 |
-} |
| 77 |
- |
| 78 |
if [ -z "${1}" ] |
| 79 |
then |
| 80 |
print_usage |
Archives