SHA256
1
0
forked from pool/systemd
Dr. Werner Fink 2014-11-20 14:00:20 +00:00 committed by Git OBS Bridge
parent 7f42a2bcfb
commit ee0a6500a0
7 changed files with 113 additions and 0 deletions

View File

@ -0,0 +1,27 @@
From a4962513c555fe3ac4b5bebf97a71701361a45b0 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Wed, 19 Nov 2014 08:13:34 -0500
Subject: [PATCH] systemd-logind.service: set Type=notify
The code already calls sd_notify("READY=1"), so we may as well take
advantage of the startup behavior in the unit. The same was done for
the journal in a87a38c20.
---
units/systemd-logind.service.in | 1 +
1 file changed, 1 insertion(+)
diff --git units/systemd-logind.service.in units/systemd-logind.service.in
index f087e99..b9fbc2c 100644
--- units/systemd-logind.service.in
+++ units/systemd-logind.service.in
@@ -19,6 +19,7 @@ Wants=dbus.socket
After=dbus.socket
[Service]
+Type=notify
ExecStart=@rootlibexecdir@/systemd-logind
Restart=always
RestartSec=0
--
1.7.9.2

View File

@ -0,0 +1,23 @@
Based on 4c3f1641f13b7687a0dc234d3ae387b7c40494ff Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 19 Nov 2014 20:52:23 +0100
Subject: [PATCH] core: watchdog bus properties cannot be both writable and
constant
---
src/core/dbus-manager.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- src/core/dbus-manager.c
+++ src/core/dbus-manager.c 2014-11-20 13:43:06.781518488 +0000
@@ -1599,8 +1599,8 @@ const sd_bus_vtable bus_manager_vtable[]
SD_BUS_PROPERTY("UnitPath", "as", NULL, offsetof(Manager, lookup_paths.unit_path), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("DefaultStandardOutput", "s", bus_property_get_exec_output, offsetof(Manager, default_std_output), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("DefaultStandardError", "s", bus_property_get_exec_output, offsetof(Manager, default_std_output), SD_BUS_VTABLE_PROPERTY_CONST),
- SD_BUS_WRITABLE_PROPERTY("RuntimeWatchdogUSec", "t", bus_property_get_usec, property_set_runtime_watchdog, offsetof(Manager, runtime_watchdog), SD_BUS_VTABLE_PROPERTY_CONST),
- SD_BUS_WRITABLE_PROPERTY("ShutdownWatchdogUSec", "t", bus_property_get_usec, bus_property_set_usec, offsetof(Manager, shutdown_watchdog), SD_BUS_VTABLE_PROPERTY_CONST),
+ SD_BUS_WRITABLE_PROPERTY("RuntimeWatchdogUSec", "t", bus_property_get_usec, property_set_runtime_watchdog, offsetof(Manager, runtime_watchdog), 0),
+ SD_BUS_WRITABLE_PROPERTY("ShutdownWatchdogUSec", "t", bus_property_get_usec, bus_property_set_usec, offsetof(Manager, shutdown_watchdog), 0),
SD_BUS_PROPERTY("ControlGroup", "s", NULL, offsetof(Manager, cgroup_root), 0),
SD_BUS_METHOD("GetUnit", "s", "o", method_get_unit, SD_BUS_VTABLE_UNPRIVILEGED),

View File

@ -0,0 +1,29 @@
From 9b772efb41c2d9f743ba5e96804bdf89b12630d8 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 19 Nov 2014 20:52:47 +0100
Subject: [PATCH] sd-bus: refuse properties that claim to be both writable and
constant at the same time
---
src/libsystemd/sd-bus/bus-objects.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git src/libsystemd/sd-bus/bus-objects.c src/libsystemd/sd-bus/bus-objects.c
index 0ab1119..7981d65 100644
--- src/libsystemd/sd-bus/bus-objects.c
+++ src/libsystemd/sd-bus/bus-objects.c
@@ -1682,6 +1682,11 @@ static int add_object_vtable_internal(
goto fail;
}
+ if (v->flags & SD_BUS_VTABLE_PROPERTY_CONST) {
+ r = -EINVAL;
+ goto fail;
+ }
+
/* Fall through */
case _SD_BUS_VTABLE_PROPERTY: {
--
1.7.9.2

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Nov 20 13:45:28 UTC 2014 - werner@suse.de
- Add upstream patches
0001-systemd-logind.service-set-Type-notify.patch
0002-core-watchdog-bus-properties-cannot-be-both-writable.patch
0003-sd-bus-refuse-properties-that-claim-to-be-both-writa.patch
-------------------------------------------------------------------
Thu Nov 20 12:18:57 UTC 2014 - werner@suse.de

View File

@ -1040,6 +1040,12 @@ Patch505: 0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch
Patch506: 0001-systemctl-let-list-units-unit-files-honour-type.patch
# PATCH-FIX-UPSTREAM added at 2014/11/18
Patch507: 0002-systemctl-obey-state-in-list-unit-files.patch
# PATCH-FIX-UPSTREAM added at 2014/11/20
Patch508: 0001-systemd-logind.service-set-Type-notify.patch
# PATCH-FIX-UPSTREAM added at 2014/11/20
Patch509: 0002-core-watchdog-bus-properties-cannot-be-both-writable.patch
# PATCH-FIX-UPSTREAM added at 2014/11/20
Patch510: 0003-sd-bus-refuse-properties-that-claim-to-be-both-writa.patch
# UDEV PATCHES
# ============
@ -1906,6 +1912,9 @@ cp %{SOURCE7} m4/
%patch505 -p0
%patch506 -p0
%patch507 -p0
%patch508 -p0
%patch509 -p0
%patch510 -p0
# udev patches
%patch1001 -p1

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Nov 20 13:45:28 UTC 2014 - werner@suse.de
- Add upstream patches
0001-systemd-logind.service-set-Type-notify.patch
0002-core-watchdog-bus-properties-cannot-be-both-writable.patch
0003-sd-bus-refuse-properties-that-claim-to-be-both-writa.patch
-------------------------------------------------------------------
Thu Nov 20 12:18:57 UTC 2014 - werner@suse.de

View File

@ -1035,6 +1035,12 @@ Patch505: 0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch
Patch506: 0001-systemctl-let-list-units-unit-files-honour-type.patch
# PATCH-FIX-UPSTREAM added at 2014/11/18
Patch507: 0002-systemctl-obey-state-in-list-unit-files.patch
# PATCH-FIX-UPSTREAM added at 2014/11/20
Patch508: 0001-systemd-logind.service-set-Type-notify.patch
# PATCH-FIX-UPSTREAM added at 2014/11/20
Patch509: 0002-core-watchdog-bus-properties-cannot-be-both-writable.patch
# PATCH-FIX-UPSTREAM added at 2014/11/20
Patch510: 0003-sd-bus-refuse-properties-that-claim-to-be-both-writa.patch
# UDEV PATCHES
# ============
@ -1901,6 +1907,9 @@ cp %{SOURCE7} m4/
%patch505 -p0
%patch506 -p0
%patch507 -p0
%patch508 -p0
%patch509 -p0
%patch510 -p0
# udev patches
%patch1001 -p1