pool/plymouth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 200841 from home:lnussel:branches:Base:System

Browse Source 
- 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
This commit is contained in:
Marcus Meissner 2013-09-27 08:51:51 +00:00 committed by Git OBS Bridge
parent 266d874483
commit 269a23abd0
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plymouth.changes
View File

@ -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 Wed Sep 11 01:57:40 UTC 2013 - crrodriguez@opensuse.org

29
suse-initrd-support
View File

@ -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.8_git201309032142.orig/configure.ac
+++ plymouth-0.8.6.1/configure.ac +++ plymouth-0.8.8_git201309032142/configure.ac
@@ -452,6 +452,7 @@ AC_CONFIG_FILES([Makefile @@ -302,6 +302,7 @@ AC_CONFIG_FILES([Makefile
themes/spinner/Makefile themes/spinner/Makefile
themes/script/Makefile themes/script/Makefile
images/Makefile images/Makefile
@ -10,10 +10,10 @@ Index: plymouth-0.8.6.1/configure.ac
scripts/plymouth-generate-initrd scripts/plymouth-generate-initrd
scripts/plymouth-populate-initrd scripts/plymouth-populate-initrd
scripts/plymouth-set-default-theme 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 --- /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 @@ @@ -0,0 +1,23 @@
+#!/bin/bash +#!/bin/bash
+#%stage: setup +#%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" + echo "init $init is not systemd, terminate plymouth"
+ plymouth quit + plymouth quit
+fi +fi
Index: plymouth-0.8.6.1/scripts/boot-plymouth.sh Index: plymouth-0.8.8_git201309032142/scripts/boot-plymouth.sh
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ plymouth-0.8.6.1/scripts/boot-plymouth.sh +++ plymouth-0.8.8_git201309032142/scripts/boot-plymouth.sh
@@ -0,0 +1,22 @@ @@ -0,0 +1,23 @@
+#!/bin/bash +#!/bin/bash
+#%stage: boot +#%stage: boot
+#%depends: start udev kms +#%depends: start udev kms
+#%programs: /usr/bin/plymouth /usr/sbin/plymouthd +#%programs: /usr/bin/plymouth /usr/sbin/plymouthd
+#%if: -z "$root_luks" -a -z "$luks"
+ +
+enable_plymouth=1 +enable_plymouth=1
+for o in $(cat /proc/cmdline) ; do +for o in $(cat /proc/cmdline) ; do
@ -65,10 +66,10 @@ Index: plymouth-0.8.6.1/scripts/boot-plymouth.sh
+ plymouth show-splash + plymouth show-splash
+fi +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 --- /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 @@ @@ -0,0 +1,59 @@
+#!/bin/bash +#!/bin/bash
+# +#
@ -129,10 +130,10 @@ Index: plymouth-0.8.6.1/scripts/setup-plymouth.sh.in
+fi +fi
+install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc} +install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc}
+mkdir -p $tmp_mnt/var/cache/fontconfig +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.8_git201309032142.orig/scripts/plymouth-update-initrd
+++ plymouth-0.8.6.1/scripts/plymouth-update-initrd +++ plymouth-0.8.8_git201309032142/scripts/plymouth-update-initrd
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
-mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r) -mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)