From bcd47dea1cd7e83cbd75d1827c27fb3fbf7735f5e57f462775905dc7faa95c6f Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 23 Aug 2012 08:06:58 +0000 Subject: [PATCH] Accepting request 131368 from home:fcrozat:branches:Base:System - Add plymouth-after-udev-settle.patch: ensure plymouth is started after udev triggers has been started (git + name change due to systemd < 183 in openSUSE 12.2). OBS-URL: https://build.opensuse.org/request/show/131368 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=79 --- plymouth-after-udev-settle.patch | 13 +++++++++++++ plymouth.changes | 7 +++++++ plymouth.spec | 3 +++ 3 files changed, 23 insertions(+) create mode 100644 plymouth-after-udev-settle.patch diff --git a/plymouth-after-udev-settle.patch b/plymouth-after-udev-settle.patch new file mode 100644 index 0000000..92a09e9 --- /dev/null +++ b/plymouth-after-udev-settle.patch @@ -0,0 +1,13 @@ +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 +@@ -2,7 +2,7 @@ + Description=Show Plymouth Boot Screen + DefaultDependencies=no + Wants=systemd-ask-password-plymouth.path +-After=systemd-vconsole-setup.service systemd-udev-settle.service ++After=systemd-vconsole-setup.service udev-trigger.service + Before=systemd-ask-password-plymouth.service + ConditionKernelCommandLine=!plymouth.enable=0 + ConditionPathExists=!@plymouthruntimedir@/pid diff --git a/plymouth.changes b/plymouth.changes index 63a831b..622f5f1 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 22 14:04:13 UTC 2012 - fcrozat@suse.com + +- Add plymouth-after-udev-settle.patch: ensure plymouth is started + after udev triggers has been started (git + name change due to + systemd < 183 in openSUSE 12.2). + ------------------------------------------------------------------- Wed Aug 22 11:41:57 UTC 2012 - tittiatcoke@gmail.com diff --git a/plymouth.spec b/plymouth.spec index ed3cc57..265733b 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -52,6 +52,8 @@ 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 +# PATCH-FIX-UPSTREAM -- Start plymouth avec udev-trigger.service +Patch12: plymouth-after-udev-settle.patch BuildRequires: automake BuildRequires: kernel-headers BuildRequires: libtool @@ -317,6 +319,7 @@ plugin. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch12 -p1 # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c