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 +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 + diff --git a/plymouth.spec b/plymouth.spec index 65194b2..e0218a4 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -8,7 +8,7 @@ Summary: Graphical Boot Animation and Logger Name: plymouth Version: 0.8.9 -Release: 2%{?snapshot_date}%{?dist} +Release: 3%{?snapshot_date}%{?dist} License: GPLv2+ Group: System Environment/Base 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-utils < 0.8.4-0.20101119.4 +Patch0: dont-timeout-waiting.patch + %description Plymouth provides an attractive graphical boot animation in 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 %setup -q +%patch0 -p1 -b .dont-timeout-waiting # Change the default theme sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults @@ -492,6 +495,10 @@ fi %defattr(-, root, root) %changelog +* Thu Oct 31 2013 Ray Strode 0.8.9-3.2013.08.14 +- Don't timeout plymouth quit waiting + Related: #967521 + * Wed Oct 16 2013 Ray Strode 0.8.9-2.2013.08.14 - Drop rhgb-client compat link