Accepting request 368139 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/368139
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=229
This commit is contained in:
Dominique Leuenberger 2016-03-16 09:23:42 +00:00 committed by Git OBS Bridge
parent c83da77762
commit e3627545a2
5 changed files with 86 additions and 1 deletions

View File

@ -0,0 +1,54 @@
From 1b4cd0cf11feb7d41f2eff17f86fa55b31bb6841 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 18 Feb 2016 22:51:23 +0100
Subject: [PATCH] core: exclude .slice units from "systemctl isolate"
Fixes: #1969
---
src/core/scope.c | 3 +--
src/core/slice.c | 8 ++++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git src/core/scope.c src/core/scope.c
index c5d0ece..361695c 100644
--- src/core/scope.c
+++ src/core/scope.c
@@ -50,8 +50,7 @@ static void scope_init(Unit *u) {
assert(u->load_state == UNIT_STUB);
s->timeout_stop_usec = u->manager->default_timeout_stop_usec;
-
- UNIT(s)->ignore_on_isolate = true;
+ u->ignore_on_isolate = true;
}
static void scope_done(Unit *u) {
diff --git src/core/slice.c src/core/slice.c
index d65364c..667f61b 100644
--- src/core/slice.c
+++ src/core/slice.c
@@ -34,6 +34,13 @@ static const UnitActiveState state_translation_table[_SLICE_STATE_MAX] = {
[SLICE_ACTIVE] = UNIT_ACTIVE
};
+static void slice_init(Unit *u) {
+ assert(u);
+ assert(u->load_state == UNIT_STUB);
+
+ u->ignore_on_isolate = true;
+}
+
static void slice_set_state(Slice *t, SliceState state) {
SliceState old_state;
assert(t);
@@ -305,6 +312,7 @@ const UnitVTable slice_vtable = {
.no_instances = true,
.can_transient = true,
+ .init = slice_init,
.load = slice_load,
.coldplug = slice_coldplug,
--
2.6.2

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Mar 1 09:16:08 UTC 2016 - werner@suse.de
- Add upstream patch
0001-core-exclude-.slice-units-from-systemctl-isolate.patch
this fixes forced logouts on isolate target aka changing runlevel
(boo#966535)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 9 22:46:21 UTC 2016 - afaerber@suse.de Sat Jan 9 22:46:21 UTC 2016 - afaerber@suse.de
@ -26,6 +34,12 @@ Wed Dec 9 15:12:30 UTC 2015 - crrodriguez@opensuse.org
- spec: update minimum kernel version to 3.11 - spec: update minimum kernel version to 3.11
- Update minimum util-linux version to 2.27.1 - Update minimum util-linux version to 2.27.1
-------------------------------------------------------------------
Thu Dec 3 15:33:27 UTC 2015 - tchvatal@suse.com
- Add patch to enable working steam controller:
* 1099-Add-default-rules-for-valve-steam-controller-to-work.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 30 13:59:52 UTC 2015 - thomas.blume@suse.com Mon Nov 30 13:59:52 UTC 2015 - thomas.blume@suse.com

View File

@ -248,6 +248,8 @@ Patch522: Correct_assert_on_unexpected_error_code.patch
Patch523: let-vconsole-setup-get-properties-only-once-to-copy-them.patch Patch523: let-vconsole-setup-get-properties-only-once-to-copy-them.patch
# PATCH-FIX-UPSTREAM (bsc#956712) # PATCH-FIX-UPSTREAM (bsc#956712)
Patch524: 0001-nss-mymachines-do-not-allow-overlong-machine-names.patch Patch524: 0001-nss-mymachines-do-not-allow-overlong-machine-names.patch
# PATCH-FIX-UPSTREAM (bsc#966535)
Patch525: 0001-core-exclude-.slice-units-from-systemctl-isolate.patch
# UDEV PATCHES # UDEV PATCHES
# ============ # ============
@ -289,8 +291,10 @@ Patch1096: 1096-new-udev-root-symlink-generator.patch
Patch1097: 1097-udevd-increase-maximum-number-of-children.patch Patch1097: 1097-udevd-increase-maximum-number-of-children.patch
# PATCH-FIX-OPENSUSE 1098-systemd-networkd-alias-network-service.patch # PATCH-FIX-OPENSUSE 1098-systemd-networkd-alias-network-service.patch
Patch1098: 1098-systemd-networkd-alias-network-service.patch Patch1098: 1098-systemd-networkd-alias-network-service.patch
# PATCH-FIX-OPENSUSE 1099-Add-default-rules-for-valve-steam-controller-to-work.patch
Patch1099: 1099-Add-default-rules-for-valve-steam-controller-to-work.patch
# PATCH-FIX-OPENSUSE hostname-NULL.patch - fix crash on xen build hosts in OBS Marcus Meissner # PATCH-FIX-OPENSUSE hostname-NULL.patch - fix crash on xen build hosts in OBS Marcus Meissner
Patch1099: hostname-NULL.patch Patch1100: hostname-NULL.patch
%description %description
Systemd is a system and service manager, compatible with SysV and LSB Systemd is a system and service manager, compatible with SysV and LSB
@ -586,6 +590,7 @@ cp %{SOURCE7} m4/
%patch522 -p1 %patch522 -p1
%patch523 -p0 %patch523 -p0
%patch524 -p1 %patch524 -p1
%patch525 -p0
# udev patches # udev patches
%patch1002 -p1 %patch1002 -p1
@ -607,6 +612,7 @@ cp %{SOURCE7} m4/
%patch1097 -p1 %patch1097 -p1
%patch1098 -p1 %patch1098 -p1
%patch1099 -p1 %patch1099 -p1
%patch1100 -p1
# #
# In combination with Patch352 set-and-use-default-logconsole.patch # In combination with Patch352 set-and-use-default-logconsole.patch

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Mar 1 09:16:08 UTC 2016 - werner@suse.de
- Add upstream patch
0001-core-exclude-.slice-units-from-systemctl-isolate.patch
this fixes forced logouts on isolate target aka changing runlevel
(boo#966535)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 9 22:46:21 UTC 2016 - afaerber@suse.de Sat Jan 9 22:46:21 UTC 2016 - afaerber@suse.de

View File

@ -243,6 +243,8 @@ Patch522: Correct_assert_on_unexpected_error_code.patch
Patch523: let-vconsole-setup-get-properties-only-once-to-copy-them.patch Patch523: let-vconsole-setup-get-properties-only-once-to-copy-them.patch
# PATCH-FIX-UPSTREAM (bsc#956712) # PATCH-FIX-UPSTREAM (bsc#956712)
Patch524: 0001-nss-mymachines-do-not-allow-overlong-machine-names.patch Patch524: 0001-nss-mymachines-do-not-allow-overlong-machine-names.patch
# PATCH-FIX-UPSTREAM (bsc#966535)
Patch525: 0001-core-exclude-.slice-units-from-systemctl-isolate.patch
# UDEV PATCHES # UDEV PATCHES
# ============ # ============
@ -583,6 +585,7 @@ cp %{SOURCE7} m4/
%patch522 -p1 %patch522 -p1
%patch523 -p0 %patch523 -p0
%patch524 -p1 %patch524 -p1
%patch525 -p0
# udev patches # udev patches
%patch1002 -p1 %patch1002 -p1