From 5e854e12f1ce1cf3d7caacc6d86cff6b5c0fa995 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 29 2014 20:31:42 +0000 Subject: import systemd-208-11.el7_0.2 --- diff --git a/SOURCES/0233-units-serial-getty-.service-add-Install-section.patch b/SOURCES/0233-units-serial-getty-.service-add-Install-section.patch new file mode 100644 index 0000000..ec8132e --- /dev/null +++ b/SOURCES/0233-units-serial-getty-.service-add-Install-section.patch @@ -0,0 +1,26 @@ +From 2e1c925693871dfba76845b82bb653dc09b2de97 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 24 Feb 2014 08:02:28 -0500 +Subject: [PATCH] units/serial-getty@.service: add [Install] section + +This makes it easier to manually enable and disable +specific gettys, and also mirrors getty@.service. + +http://lists.freedesktop.org/archives/systemd-devel/2014-February/017329.html + +Resolves: #1118230 +--- + units/serial-getty@.service.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 +index e32c6b7..aea078f 100644 +--- a/units/serial-getty@.service.m4 ++++ b/units/serial-getty@.service.m4 +@@ -33,3 +33,6 @@ TTYVHangup=yes + KillMode=process + IgnoreSIGPIPE=no + SendSIGHUP=yes ++ ++[Install] ++WantedBy=getty.target diff --git a/SOURCES/0234-units-order-network-online.target-after-network.targ.patch b/SOURCES/0234-units-order-network-online.target-after-network.targ.patch new file mode 100644 index 0000000..361bc19 --- /dev/null +++ b/SOURCES/0234-units-order-network-online.target-after-network.targ.patch @@ -0,0 +1,19 @@ +From 8ace570670d71d13fe604e7cf9d264de245ac981 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Mon, 21 Jul 2014 15:13:15 +0200 +Subject: [PATCH] units: order network-online.target after network.target + +Resolves: #1121650 +--- + units/network-online.target | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/units/network-online.target b/units/network-online.target +index a40c44c..67bc4fa 100644 +--- a/units/network-online.target ++++ b/units/network-online.target +@@ -9,3 +9,4 @@ + Description=Network is Online + Documentation=man:systemd.special(7) + Documentation=http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget ++After=network.target diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec index 67dad2f..54df6e8 100644 --- a/SPECS/systemd.spec +++ b/SPECS/systemd.spec @@ -11,7 +11,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 208 -Release: 11%{?dist} +Release: 11%{?dist}.2 # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -263,6 +263,8 @@ Patch0229: 0229-Fix-prototype-of-get_process_state.patch Patch0230: 0230-core-check-for-return-value-from-get_process_state.patch Patch0231: 0231-unit-add-waiting-jobs-to-run-queue-in-unit_coldplug.patch Patch0232: 0232-logind-session-save-stopping-flag.patch +Patch0233: 0233-units-serial-getty-.service-add-Install-section.patch +Patch0234: 0234-units-order-network-online.target-after-network.targ.patch %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} @@ -1061,6 +1063,12 @@ getent passwd systemd-journal-gateway >/dev/null 2>&1 || useradd -r -l -u 191 -g %{_datadir}/systemd/gatewayd %changelog +* Mon Jul 21 2014 Lukáš Nykrýn - 208-11.2 +- units: order network-online.target after network.target + +* Fri Jul 11 2014 Lukáš Nykrýn - 208-11.1 +- units/serial-getty@.service: add [Install] section + * Wed Apr 02 2014 Lukáš Nykrýn - 208-11 - logind-session: save stopping flag (#1082692) - unit: add waiting jobs to run queue in unit_coldplug (#1083159)