SHA256
1
0
forked from pool/systemd
Dr. Werner Fink 2014-05-27 07:24:26 +00:00 committed by Git OBS Bridge
parent 3928f4018f
commit 5dfc1adc91
6 changed files with 98 additions and 0 deletions

View File

@ -0,0 +1,26 @@
From 000f6e5667eb4f73e137cbd0d7395a9f9db7728a Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Mon, 26 May 2014 20:09:45 +0200
Subject: [PATCH] Do not unescape unit names in [Install] section
https://bugs.freedesktop.org/show_bug.cgi?id=49316
---
src/shared/conf-parser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git src/shared/conf-parser.c src/shared/conf-parser.c
index 77a172e..158e9ef 100644
--- src/shared/conf-parser.c
+++ src/shared/conf-parser.c
@@ -688,7 +688,7 @@ int config_parse_strv(const char *unit,
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
char *n;
- n = cunescape_length(w, l);
+ n = strndup(w, l);
if (!n)
return log_oom();
--
1.7.9.2

View File

@ -0,0 +1,46 @@
From 1f89214e6e990a0b552f6854f87f8514ca384956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
Date: Fri, 21 Feb 2014 11:55:24 +0100
Subject: [PATCH] analyze/run: use bus_open_transport_systemd instead of
bus_open_transport
Both systemd-analyze and systemd-run only access org.freedesktop.systemd1
on the bus. This patch allows using systemd-run --user and systemd-analyze
--user even if the user session's bus is not properly integrated with the
systemd user unit.
https://bugs.freedesktop.org/show_bug.cgi?id=79252 and other reports...
---
src/analyze/analyze.c | 2 +-
src/run/run.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git src/analyze/analyze.c src/analyze/analyze.c
index 4c5fcfe..0a4190c 100644
--- src/analyze/analyze.c
+++ src/analyze/analyze.c
@@ -1335,7 +1335,7 @@ int main(int argc, char *argv[]) {
if (r <= 0)
goto finish;
- r = bus_open_transport(arg_transport, arg_host, arg_user, &bus);
+ r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus);
if (r < 0) {
log_error("Failed to create bus connection: %s", strerror(-r));
goto finish;
diff --git src/run/run.c src/run/run.c
index e4c695c..9d5527b 100644
--- src/run/run.c
+++ src/run/run.c
@@ -593,7 +593,7 @@ int main(int argc, char* argv[]) {
arg_description = description;
}
- r = bus_open_transport(arg_transport, arg_host, arg_user, &bus);
+ r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus);
if (r < 0) {
log_error("Failed to create bus connection: %s", strerror(-r));
goto finish;
--
1.7.9.2

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 27 07:23:47 UTC 2014 - werner@suse.de
- Add upstream patches
0001-Do-not-unescape-unit-names-in-Install-section.patch
0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch
-------------------------------------------------------------------
Mon May 26 16:34:10 UTC 2014 - werner@suse.de

View File

@ -507,6 +507,10 @@ Patch257: 0002-nspawn-restore-journal-directory-is-empty-check.patch
Patch258: 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch
# PATCHFIX-UPSTREAM added at 2014/05/26
Patch259: 0004-socket-properly-handle-if-our-service-vanished-durin.patch
# PATCHFIX-UPSTREAM added at 2014/05/27
Patch260: 0001-Do-not-unescape-unit-names-in-Install-section.patch
# PATCHFIX-UPSTREAM added at 2014/05/27
Patch261: 0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch
# UDEV PATCHES
# ============
@ -960,6 +964,8 @@ cp %{SOURCE7} m4/
%patch257 -p0
%patch258 -p0
%patch259 -p0
%patch260 -p0
%patch261 -p0
# udev patches
%patch1001 -p1

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 27 07:23:47 UTC 2014 - werner@suse.de
- Add upstream patches
0001-Do-not-unescape-unit-names-in-Install-section.patch
0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch
-------------------------------------------------------------------
Mon May 26 16:34:10 UTC 2014 - werner@suse.de

View File

@ -502,6 +502,10 @@ Patch257: 0002-nspawn-restore-journal-directory-is-empty-check.patch
Patch258: 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch
# PATCHFIX-UPSTREAM added at 2014/05/26
Patch259: 0004-socket-properly-handle-if-our-service-vanished-durin.patch
# PATCHFIX-UPSTREAM added at 2014/05/27
Patch260: 0001-Do-not-unescape-unit-names-in-Install-section.patch
# PATCHFIX-UPSTREAM added at 2014/05/27
Patch261: 0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch
# UDEV PATCHES
# ============
@ -955,6 +959,8 @@ cp %{SOURCE7} m4/
%patch257 -p0
%patch258 -p0
%patch259 -p0
%patch260 -p0
%patch261 -p0
# udev patches
%patch1001 -p1