new upstream release
This commit is contained in:
parent
61aff02cb6
commit
b492114b29
1
.gitignore
vendored
1
.gitignore
vendored
@ -18,3 +18,4 @@ systemd-*src.rpm
|
|||||||
/systemd-18.tar.bz2
|
/systemd-18.tar.bz2
|
||||||
/systemd-19.tar.bz2
|
/systemd-19.tar.bz2
|
||||||
/systemd-20.tar.bz2
|
/systemd-20.tar.bz2
|
||||||
|
/systemd-21.tar.bz2
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
c1c98eed410ec108b8bf74e4d94d5d66 systemd-20.tar.bz2
|
dff5735b30840d2ccc4a0b55d3af9c47 systemd-21.tar.bz2
|
||||||
|
@ -1,60 +0,0 @@
|
|||||||
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
|
|
20
systemd.spec
20
systemd.spec
@ -1,8 +1,8 @@
|
|||||||
Name: systemd
|
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: 21
|
||||||
Release: 2%{?dist}
|
Release: 1%{?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
|
||||||
@ -35,9 +35,6 @@ Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.t
|
|||||||
# 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
|
||||||
@ -82,7 +79,6 @@ 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
|
||||||
@ -127,13 +123,13 @@ mkdir -p %{buildroot}/lib/systemd/system/syslog.target.wants
|
|||||||
mkdir -p %{buildroot}%{_sysconfdir}/rpm/
|
mkdir -p %{buildroot}%{_sysconfdir}/rpm/
|
||||||
install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/
|
install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/
|
||||||
|
|
||||||
# Mask legacy stuff
|
|
||||||
ln -s rescue.service %{buildroot}/lib/systemd/system/single.service
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
# Should move to some other place eventually
|
||||||
|
mkdir -p -m 755 /run || :
|
||||||
|
|
||||||
/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
|
/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
|
||||||
/bin/systemctl daemon-reexec > /dev/null 2>&1 || :
|
/bin/systemctl daemon-reexec > /dev/null 2>&1 || :
|
||||||
|
|
||||||
@ -204,10 +200,13 @@ fi
|
|||||||
/bin/systemd-ask-password
|
/bin/systemd-ask-password
|
||||||
/bin/systemd-tty-ask-password-agent
|
/bin/systemd-tty-ask-password-agent
|
||||||
/bin/systemd-machine-id-setup
|
/bin/systemd-machine-id-setup
|
||||||
|
/usr/bin/systemd-nspawn
|
||||||
|
/usr/bin/systemd-stdio-bridge
|
||||||
/lib/systemd/systemd-*
|
/lib/systemd/systemd-*
|
||||||
/lib/udev/rules.d/*.rules
|
/lib/udev/rules.d/*.rules
|
||||||
%dir /lib/systemd/system-generators
|
%dir /lib/systemd/system-generators
|
||||||
/lib/systemd/system-generators/systemd-cryptsetup-generator
|
/lib/systemd/system-generators/systemd-cryptsetup-generator
|
||||||
|
/lib/systemd/system-generators/systemd-getty-generator
|
||||||
/%{_lib}/security/pam_systemd.so
|
/%{_lib}/security/pam_systemd.so
|
||||||
/sbin/init
|
/sbin/init
|
||||||
/sbin/reboot
|
/sbin/reboot
|
||||||
@ -260,6 +259,9 @@ fi
|
|||||||
%{_mandir}/man1/systemadm.*
|
%{_mandir}/man1/systemadm.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 29 2011 Lennart Poettering <lpoetter@redhat.com> - 21-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
* Mon Mar 28 2011 Matthias Clasen <mclasen@redhat.com> - 20-2
|
* Mon Mar 28 2011 Matthias Clasen <mclasen@redhat.com> - 20-2
|
||||||
- Apply upstream patch to not send untranslated messages to plymouth
|
- Apply upstream patch to not send untranslated messages to plymouth
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user