From 53a8d24fe958a2061c23d996477e82bf13f08fe7d22c61d6465c981f57aac284 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 8 Feb 2011 17:21:19 +0000 Subject: [PATCH] Accepting request 60330 from home:jeff_mahoney:betterbooting OBS-URL: https://build.opensuse.org/request/show/60330 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=111 --- systemd-use-plymouth | 21 +++------------------ systemd.changes | 5 +++++ 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/systemd-use-plymouth b/systemd-use-plymouth index 77da5a72..68c7b90d 100644 --- a/systemd-use-plymouth +++ b/systemd-use-plymouth @@ -7,10 +7,9 @@ Subject: systemd: Allow plymouth support from other distros than Fedora Signed-off-by: Jeff Mahoney --- - Makefile.am | 27 +++++++++++++++++---------- - configure.ac | 3 +++ - units/fedora/plymouth-start.service | 7 +++++-- - 3 files changed, 25 insertions(+), 12 deletions(-) + Makefile.am | 27 +++++++++++++++++---------- + configure.ac | 3 +++ + 2 files changed, 20 insertions(+), 10 deletions(-) --- a/Makefile.am +++ b/Makefile.am @@ -91,17 +90,3 @@ Signed-off-by: Jeff Mahoney AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name]) ---- a/units/fedora/plymouth-start.service -+++ b/units/fedora/plymouth-start.service -@@ -13,6 +13,9 @@ After=systemd-vconsole-setup.service ude - Before=systemd-ask-password-plymouth.service - - [Service] --ExecStart=/sbin/plymouthd --mode=boot --ExecStartPost=-/bin/plymouth --show-splash -+ExecStart=/bin/true -+ -+# We'd need these if we didn't start plymouth in the initramfs -+#ExecStart=/sbin/plymouthd --mode=boot -+#ExecStartPost=-/bin/plymouth --show-splash - Type=forking diff --git a/systemd.changes b/systemd.changes index cd45c81a..b9fe3c7a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 8 17:40:29 CET 2011 - jeffm@suse.de + +- Removed unecessary workaround for plymouth startup. + ------------------------------------------------------------------- Fri Feb 4 21:24:11 CET 2011 - jeffm@suse.de