Drop untranslated messages

This commit is contained in:
Matthias Clasen 2011-03-28 19:18:21 -04:00
parent 3a18c63390
commit 61aff02cb6
2 changed files with 69 additions and 1 deletions

View File

@ -0,0 +1,60 @@
From 8bf22a7b68d98f1757a1c4ea3180130eac119fd1 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann@redhat.com>
Date: Sun, 27 Mar 2011 00:18:16 -0400
Subject: [PATCH] Remove the calls to plymouth message
* messages aren't translated
* console text is ugly
* they are jargonny
* they really aren't needed
https://bugs.freedesktop.org/show_bug.cgi?id=35711
---
units/plymouth-halt.service | 1 -
units/plymouth-kexec.service | 1 -
units/plymouth-poweroff.service | 1 -
units/plymouth-reboot.service | 1 -
4 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/units/plymouth-halt.service b/units/plymouth-halt.service
index fa1a20a..962d829 100644
--- a/units/plymouth-halt.service
+++ b/units/plymouth-halt.service
@@ -14,5 +14,4 @@ DefaultDependencies=no
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
ExecStartPost=-/bin/plymouth --show-splash
-ExecStartPost=-/bin/plymouth message '--text=Halting...'
Type=forking
diff --git a/units/plymouth-kexec.service b/units/plymouth-kexec.service
index 61c6376..0d7450f 100644
--- a/units/plymouth-kexec.service
+++ b/units/plymouth-kexec.service
@@ -14,5 +14,4 @@ DefaultDependencies=no
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
ExecStartPost=-/bin/plymouth --show-splash
-ExecStartPost=-/bin/plymouth message '--text=Rebooting with kexec...'
Type=forking
diff --git a/units/plymouth-poweroff.service b/units/plymouth-poweroff.service
index c1eebb5..d4979df 100644
--- a/units/plymouth-poweroff.service
+++ b/units/plymouth-poweroff.service
@@ -14,5 +14,4 @@ DefaultDependencies=no
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
ExecStartPost=-/bin/plymouth --show-splash
-ExecStartPost=-/bin/plymouth message '--text=Powering Off...'
Type=forking
diff --git a/units/plymouth-reboot.service b/units/plymouth-reboot.service
index 974db31..7304a5f 100644
--- a/units/plymouth-reboot.service
+++ b/units/plymouth-reboot.service
@@ -14,5 +14,4 @@ DefaultDependencies=no
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
ExecStartPost=-/bin/plymouth --show-splash
-ExecStartPost=-/bin/plymouth message '--text=Rebooting...'
Type=forking
--
1.7.3.4

View File

@ -2,7 +2,7 @@ Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Version: 20 Version: 20
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Summary: A System and Service Manager Summary: A System and Service Manager
@ -34,6 +34,10 @@ Requires: kernel >= 2.6.35.2-9.fc14
Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2 Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2
# Adds support for the %%{_unitdir} macro # Adds support for the %%{_unitdir} macro
Source1: macros.systemd Source1: macros.systemd
# https://bugs.freedesktop.org/show_bug.cgi?id=35711
Patch0: systemd-plymouth-messages.patch
# For sysvinit tools # For sysvinit tools
Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24 Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24
Provides: SysVinit = 2.86-24, sysvinit = 2.86-24 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24
@ -78,6 +82,7 @@ Graphical front-end for systemd.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .plymouth-messages
%build %build
%configure --with-rootdir= --with-distro=fedora %configure --with-rootdir= --with-distro=fedora
@ -255,6 +260,9 @@ fi
%{_mandir}/man1/systemadm.* %{_mandir}/man1/systemadm.*
%changelog %changelog
* Mon Mar 28 2011 Matthias Clasen <mclasen@redhat.com> - 20-2
- Apply upstream patch to not send untranslated messages to plymouth
* Tue Mar 8 2011 Lennart Poettering <lpoetter@redhat.com> - 20-1 * Tue Mar 8 2011 Lennart Poettering <lpoetter@redhat.com> - 20-1
- New upstream release - New upstream release