1
0
forked from rpms/plymouth

Don't timeout plymouth quit waiting

Related: #967521
This commit is contained in:
Ray Strode 2013-10-31 09:49:14 -04:00
parent 63b58ed816
commit 64765e1743
2 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From d09a35029cce3972aa6fa83fdff0622a89497d1e Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@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=-@PLYMOUTH_CLIENT_DIR@/plymouth --wait
Type=oneshot
-TimeoutSec=20
+TimeoutSec=0
[Install]
WantedBy=multi-user.target
--
1.8.3.1

View File

@ -8,7 +8,7 @@
Summary: Graphical Boot Animation and Logger Summary: Graphical Boot Animation and Logger
Name: plymouth Name: plymouth
Version: 0.8.9 Version: 0.8.9
Release: 2%{?snapshot_date}%{?dist} Release: 3%{?snapshot_date}%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@ -33,6 +33,8 @@ Obsoletes: plymouth-theme-pulser < 0.7.0-0.2009.05.08.2
Obsoletes: plymouth-gdm-hooks < 0.8.4-0.20101119.4 Obsoletes: plymouth-gdm-hooks < 0.8.4-0.20101119.4
Obsoletes: plymouth-utils < 0.8.4-0.20101119.4 Obsoletes: plymouth-utils < 0.8.4-0.20101119.4
Patch0: dont-timeout-waiting.patch
%description %description
Plymouth provides an attractive graphical boot animation in Plymouth provides an attractive graphical boot animation in
place of the text messages that normally get shown. Text place of the text messages that normally get shown. Text
@ -240,6 +242,7 @@ Plymouth. It features a small spinner on a dark background.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .dont-timeout-waiting
# Change the default theme # Change the default theme
sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
@ -492,6 +495,10 @@ fi
%defattr(-, root, root) %defattr(-, root, root)
%changelog %changelog
* Thu Oct 31 2013 Ray Strode <rstrode@redhat.com> 0.8.9-3.2013.08.14
- Don't timeout plymouth quit waiting
Related: #967521
* Wed Oct 16 2013 Ray Strode <rstrode@redhat.com> 0.8.9-2.2013.08.14 * Wed Oct 16 2013 Ray Strode <rstrode@redhat.com> 0.8.9-2.2013.08.14
- Drop rhgb-client compat link - Drop rhgb-client compat link