From 269a23abd098f0b39a427e92446f1daf28327ea71d75408e98f4f889a4d2ca1e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 27 Sep 2013 08:51:51 +0000 Subject: [PATCH] Accepting request 200841 from home:lnussel:branches:Base:System - disable plymouth in initrd if the root volume is encrypted. This is a workaround until plymouth is able to handle the prompt correctly (bnc#834063). OBS-URL: https://build.opensuse.org/request/show/200841 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=127 --- plymouth.changes | 7 +++++++ suse-initrd-support | 29 +++++++++++++++-------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 7c1f89e..c216a8c 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 26 14:52:07 UTC 2013 - lnussel@suse.de + +- disable plymouth in initrd if the root volume is encrypted. This + is a workaround until plymouth is able to handle the prompt + correctly (bnc#834063). + ------------------------------------------------------------------- Wed Sep 11 01:57:40 UTC 2013 - crrodriguez@opensuse.org diff --git a/suse-initrd-support b/suse-initrd-support index a8af251..02474d2 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -1,8 +1,8 @@ -Index: plymouth-0.8.6.1/configure.ac +Index: plymouth-0.8.8_git201309032142/configure.ac =================================================================== ---- plymouth-0.8.6.1.orig/configure.ac -+++ plymouth-0.8.6.1/configure.ac -@@ -452,6 +452,7 @@ AC_CONFIG_FILES([Makefile +--- plymouth-0.8.8_git201309032142.orig/configure.ac ++++ plymouth-0.8.8_git201309032142/configure.ac +@@ -302,6 +302,7 @@ AC_CONFIG_FILES([Makefile themes/spinner/Makefile themes/script/Makefile images/Makefile @@ -10,10 +10,10 @@ Index: plymouth-0.8.6.1/configure.ac scripts/plymouth-generate-initrd scripts/plymouth-populate-initrd scripts/plymouth-set-default-theme -Index: plymouth-0.8.6.1/scripts/boot-plymouth.chroot.sh +Index: plymouth-0.8.8_git201309032142/scripts/boot-plymouth.chroot.sh =================================================================== --- /dev/null -+++ plymouth-0.8.6.1/scripts/boot-plymouth.chroot.sh ++++ plymouth-0.8.8_git201309032142/scripts/boot-plymouth.chroot.sh @@ -0,0 +1,23 @@ +#!/bin/bash +#%stage: setup @@ -38,15 +38,16 @@ Index: plymouth-0.8.6.1/scripts/boot-plymouth.chroot.sh + echo "init $init is not systemd, terminate plymouth" + plymouth quit +fi -Index: plymouth-0.8.6.1/scripts/boot-plymouth.sh +Index: plymouth-0.8.8_git201309032142/scripts/boot-plymouth.sh =================================================================== --- /dev/null -+++ plymouth-0.8.6.1/scripts/boot-plymouth.sh -@@ -0,0 +1,22 @@ ++++ plymouth-0.8.8_git201309032142/scripts/boot-plymouth.sh +@@ -0,0 +1,23 @@ +#!/bin/bash +#%stage: boot +#%depends: start udev kms +#%programs: /usr/bin/plymouth /usr/sbin/plymouthd ++#%if: -z "$root_luks" -a -z "$luks" + +enable_plymouth=1 +for o in $(cat /proc/cmdline) ; do @@ -65,10 +66,10 @@ Index: plymouth-0.8.6.1/scripts/boot-plymouth.sh + plymouth show-splash +fi + -Index: plymouth-0.8.6.1/scripts/setup-plymouth.sh.in +Index: plymouth-0.8.8_git201309032142/scripts/setup-plymouth.sh.in =================================================================== --- /dev/null -+++ plymouth-0.8.6.1/scripts/setup-plymouth.sh.in ++++ plymouth-0.8.8_git201309032142/scripts/setup-plymouth.sh.in @@ -0,0 +1,59 @@ +#!/bin/bash +# @@ -129,10 +130,10 @@ Index: plymouth-0.8.6.1/scripts/setup-plymouth.sh.in +fi +install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc} +mkdir -p $tmp_mnt/var/cache/fontconfig -Index: plymouth-0.8.6.1/scripts/plymouth-update-initrd +Index: plymouth-0.8.8_git201309032142/scripts/plymouth-update-initrd =================================================================== ---- plymouth-0.8.6.1.orig/scripts/plymouth-update-initrd -+++ plymouth-0.8.6.1/scripts/plymouth-update-initrd +--- plymouth-0.8.8_git201309032142.orig/scripts/plymouth-update-initrd ++++ plymouth-0.8.8_git201309032142/scripts/plymouth-update-initrd @@ -1,2 +1,2 @@ #!/bin/bash -mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)