diff --git a/plymouth-fix-systemd-service.patch b/plymouth-fix-systemd-service.patch new file mode 100644 index 0000000..bd738d4 --- /dev/null +++ b/plymouth-fix-systemd-service.patch @@ -0,0 +1,21 @@ +From 88c2e7dcf8adff93a335418390fb5f23f83e4f3c Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Mon, 23 Jul 2012 17:36:03 -0400 +Subject: [PATCH] systemd: more updates to start service + +The dashes next to the semi-colons seem to confuse systemd so drop them. +--- + systemd-units/plymouth-start.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: plymouth-0.8.6.1/systemd-units/plymouth-start.service.in +=================================================================== +--- plymouth-0.8.6.1.orig/systemd-units/plymouth-start.service.in ++++ plymouth-0.8.6.1/systemd-units/plymouth-start.service.in +@@ -9,5 +9,5 @@ ConditionPathExists=!@plymouthruntimedir + + [Service] + ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session +-ExecStartPost=-/bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev;-/bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev; -@PLYMOUTH_CLIENT_DIR@/plymouth show-splash ++ExecStartPost=-/bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; /bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash + Type=forking diff --git a/plymouth-udevadm-path.patch b/plymouth-udevadm-path.patch index df9429a..829ae3e 100644 --- a/plymouth-udevadm-path.patch +++ b/plymouth-udevadm-path.patch @@ -6,6 +6,6 @@ Index: plymouth-0.8.6.1/systemd-units/plymouth-start.service.in [Service] ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session --ExecStartPost=-/bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev;-/bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev; -@PLYMOUTH_CLIENT_DIR@/plymouth show-splash -+ExecStartPost=-/sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev;-/sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev; -@PLYMOUTH_CLIENT_DIR@/plymouth show-splash +-ExecStartPost=-/bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; /bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash ++ExecStartPost=-/sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; /sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash Type=forking diff --git a/plymouth.changes b/plymouth.changes index 197b46d..c827da1 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Aug 8 09:03:58 UTC 2012 - fcrozat@suse.com + +- Add plymouth-fix-systemd-service.patch: remove dashes next to + semi-colons, it confuses systemd. (bnc#774400) +- Update suse-initrd-support to not start plymouth if kernel + cmdline contains "shell" or "plymouth.enable=0" or + "rd.plymouth=0". + ------------------------------------------------------------------- Mon Aug 6 12:39:41 UTC 2012 - dmueller@suse.com diff --git a/plymouth.spec b/plymouth.spec index 4921375..ed3cc57 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -50,6 +50,8 @@ Patch8: systemd-no-warning.patch # PATCH-FIX-UPSTREAM -- Recognize quotes often used in sysconfig-style files Patch9: 0001-ply-text-progress-bar-strip-quotes-if-present.patch Patch10: 0001-Some-greenish-openSUSE-colors.patch +# PATCH-FIX-UPSTREAM -- Fix systemd service file +Patch11: plymouth-fix-systemd-service.patch BuildRequires: automake BuildRequires: kernel-headers BuildRequires: libtool @@ -310,9 +312,11 @@ plugin. %patch5 -p1 %endif %patch6 -p1 +%patch11 -p1 %patch7 -p1 %patch8 -p1 -%patch -P 9 -P 10 -p1 +%patch9 -p1 +%patch10 -p1 # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c diff --git a/suse-initrd-support b/suse-initrd-support index dcff8bf..737740b 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -1,8 +1,8 @@ -Index: plymouth-0.8.4/configure.ac +Index: plymouth-0.8.6.1/configure.ac =================================================================== ---- plymouth-0.8.4.orig/configure.ac -+++ plymouth-0.8.4/configure.ac -@@ -440,6 +440,7 @@ AC_CONFIG_FILES([Makefile +--- plymouth-0.8.6.1.orig/configure.ac ++++ plymouth-0.8.6.1/configure.ac +@@ -452,6 +452,7 @@ AC_CONFIG_FILES([Makefile themes/spinner/Makefile themes/script/Makefile images/Makefile @@ -10,10 +10,10 @@ Index: plymouth-0.8.4/configure.ac scripts/plymouth-generate-initrd scripts/plymouth-populate-initrd scripts/plymouth-set-default-theme -Index: plymouth-0.8.4/scripts/boot-plymouth.chroot.sh +Index: plymouth-0.8.6.1/scripts/boot-plymouth.chroot.sh =================================================================== --- /dev/null -+++ plymouth-0.8.4/scripts/boot-plymouth.chroot.sh ++++ plymouth-0.8.6.1/scripts/boot-plymouth.chroot.sh @@ -0,0 +1,23 @@ +#!/bin/bash +#%stage: setup @@ -38,25 +38,37 @@ Index: plymouth-0.8.4/scripts/boot-plymouth.chroot.sh + echo "init $init is not systemd, terminate plymouth" + plymouth quit +fi -Index: plymouth-0.8.4/scripts/boot-plymouth.sh +Index: plymouth-0.8.6.1/scripts/boot-plymouth.sh =================================================================== --- /dev/null -+++ plymouth-0.8.4/scripts/boot-plymouth.sh -@@ -0,0 +1,10 @@ ++++ plymouth-0.8.6.1/scripts/boot-plymouth.sh +@@ -0,0 +1,22 @@ +#!/bin/bash +#%stage: boot +#%depends: start udev kms +#%programs: /usr/bin/plymouth /usr/sbin/plymouthd + -+mkdir --mode 755 /run/plymouth ++enable_plymouth=1 ++for o in $(cat /proc/cmdline) ; do ++ case "$o" in ++ shell*|plymouth.enable=0*|rd.plymouth=0*) ++ enable_plymouth=0 ++ break ++ ;; ++ esac ++done ++if [ "$enable_plymouth" = "1" ]; then ++ mkdir --mode 755 /run/plymouth + -+/usr/sbin/plymouthd --attach-to-session --pid-file /run/plymouth/pid ++ /usr/sbin/plymouthd --attach-to-session --pid-file /run/plymouth/pid + -+plymouth show-splash -Index: plymouth-0.8.4/scripts/setup-plymouth.sh.in ++ plymouth show-splash ++fi ++ +Index: plymouth-0.8.6.1/scripts/setup-plymouth.sh.in =================================================================== --- /dev/null -+++ plymouth-0.8.4/scripts/setup-plymouth.sh.in ++++ plymouth-0.8.6.1/scripts/setup-plymouth.sh.in @@ -0,0 +1,60 @@ +#!/bin/bash +# @@ -118,10 +130,10 @@ Index: plymouth-0.8.4/scripts/setup-plymouth.sh.in +install -D ${_pangomod} $tmp_mnt/${_pangomod} +install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc} +mkdir -p $tmp_mnt/var/cache/fontconfig -Index: plymouth-0.8.4/scripts/plymouth-update-initrd +Index: plymouth-0.8.6.1/scripts/plymouth-update-initrd =================================================================== ---- plymouth-0.8.4.orig/scripts/plymouth-update-initrd -+++ plymouth-0.8.4/scripts/plymouth-update-initrd +--- plymouth-0.8.6.1.orig/scripts/plymouth-update-initrd ++++ plymouth-0.8.6.1/scripts/plymouth-update-initrd @@ -1,2 +1,2 @@ #!/bin/bash -mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)