[plymouth/f19] Don't timeout plymouth quit waiting
Ray Strode
rstrode at fedoraproject.org
Thu Oct 31 14:42:10 UTC 2013
commit f4ac41cd4339fe0c000456275916aa95c2364f16
Author: Ray Strode <rstrode at redhat.com>
Date: Thu Oct 31 10:42:08 2013 -0400
Don't timeout plymouth quit waiting
Related: #967521
dont-timeout-waiting.patch | 29 +++++++++++++++++++++++++++++
plymouth.spec | 8 +++++++-
2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/dont-timeout-waiting.patch b/dont-timeout-waiting.patch
new file mode 100644
index 0000000..ffab6db
--- /dev/null
+++ b/dont-timeout-waiting.patch
@@ -0,0 +1,29 @@
+From d09a35029cce3972aa6fa83fdff0622a89497d1e Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Thu, 31 Oct 2013 09:46:56 -0400
+Subject: [PATCH] systemd-units: don't timeout the plymouth waiting
+
+A timeout causes things to fail, so we shouldn't timeout.
+---
+ systemd-units/plymouth-quit-wait.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/systemd-units/plymouth-quit-wait.service.in b/systemd-units/plymouth-quit-wait.service.in
+index 0293224..1c431b6 100644
+--- a/systemd-units/plymouth-quit-wait.service.in
++++ b/systemd-units/plymouth-quit-wait.service.in
+@@ -1,10 +1,10 @@
+ [Unit]
+ Description=Wait for Plymouth Boot Screen to Quit
+ After=rc-local.service plymouth-start.service systemd-user-sessions.service
+
+ [Service]
+ ExecStart=- at PLYMOUTH_CLIENT_DIR@/plymouth --wait
+ Type=oneshot
+-TimeoutSec=20
++TimeoutSec=0
+ [Install]
+ WantedBy=multi-user.target
+--
+1.8.3.1
+
diff --git a/plymouth.spec b/plymouth.spec
index d23bf91..015d033 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -6,7 +6,7 @@
Summary: Graphical Boot Animation and Logger
Name: plymouth
Version: 0.8.9
-Release: 0.2013.03.26.0%{?dist}
+Release: 0.2013.03.26.1%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -32,6 +32,7 @@ Obsoletes: plymouth-gdm-hooks < 0.8.4-0.20101119.4
Obsoletes: plymouth-utils < 0.8.4-0.20101119.4
Patch2: drm-dirty-fb.patch
+Patch3: dont-timeout-waiting.patch
%description
Plymouth provides an attractive graphical boot animation in
@@ -241,6 +242,7 @@ Plymouth. It features a small spinner on a dark background.
%prep
%setup -q
%patch2 -p1 -b .drm-dirty
+%patch3 -p1 -b .dont-timeout-waiting
# Change the default theme
sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
@@ -497,6 +499,10 @@ fi
%defattr(-, root, root)
%changelog
+* Thu Oct 31 2013 Ray Strode <rstrode at redhat.com> 0.8.9-0.2013.03.26.1
+- Don't timeout plymouth quit waiting
+ Related: #967521
+
* Tue Mar 26 2013 Ray Strode <rstrode at redhat.com> 0.8.9-0.2013.03.26.0
- Update to snapshot to fix systemd vconsole issue
More information about the scm-commits
mailing list