summaryrefslogtreecommitdiffstats
path: root/core/modules/systemd
diff options
context:
space:
mode:
authorSimon Rettberg2018-08-31 13:15:29 +0200
committerYour Name2018-08-31 13:15:29 +0200
commitb0b43806b116180965b07a443840f1fdb7cf320f (patch)
tree65e80aeba2b17d37c7e1723c2d0304013a468834 /core/modules/systemd
parent[systemd] Update to v234 (diff)
downloadmltk-b0b43806b116180965b07a443840f1fdb7cf320f.tar.gz
mltk-b0b43806b116180965b07a443840f1fdb7cf320f.tar.xz
mltk-b0b43806b116180965b07a443840f1fdb7cf320f.zip
[systemd] Fix path in openslx patch
Diffstat (limited to 'core/modules/systemd')
-rw-r--r--core/modules/systemd/systemd-openslx-229.patch12
-rw-r--r--[l---------]core/modules/systemd/systemd-openslx-234.patch14
2 files changed, 20 insertions, 6 deletions
diff --git a/core/modules/systemd/systemd-openslx-229.patch b/core/modules/systemd/systemd-openslx-229.patch
index c0437a84..7e7d4bb9 100644
--- a/core/modules/systemd/systemd-openslx-229.patch
+++ b/core/modules/systemd/systemd-openslx-229.patch
@@ -1,11 +1,13 @@
---- basic/path-util.h.orig 2016-04-20 07:41:33.425103517 +0200
-+++ basic/path-util.h 2016-04-20 07:42:27.192454435 +0200
-@@ -26,7 +26,7 @@
+--- src/basic/path-util.h.orig 2018-08-31 13:09:43.340073158 +0200
++++ src/basic/path-util.h 2018-08-31 13:04:18.351554545 +0200
+@@ -27,8 +27,8 @@
#include "macro.h"
#include "time-util.h"
-#define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
-+#define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
- #define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":/sbin:/bin"
+-#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":/sbin:/bin"
++#define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
++#define DEFAULT_PATH_SPLIT_USR "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin"
#ifdef HAVE_SPLIT_USR
+ # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR
diff --git a/core/modules/systemd/systemd-openslx-234.patch b/core/modules/systemd/systemd-openslx-234.patch
index 68290ecb..35d1e273 120000..100644
--- a/core/modules/systemd/systemd-openslx-234.patch
+++ b/core/modules/systemd/systemd-openslx-234.patch
@@ -1 +1,13 @@
-systemd-openslx-229.patch \ No newline at end of file
+--- src/basic/path-util.h.orig 2018-08-31 13:09:43.340073158 +0200
++++ src/basic/path-util.h 2018-08-31 13:04:18.351554545 +0200
+@@ -27,8 +27,8 @@
+ #include "string-util.h"
+ #include "time-util.h"
+
+-#define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
+-#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":/sbin:/bin"
++#define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
++#define DEFAULT_PATH_SPLIT_USR "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin"
+
+ #ifdef HAVE_SPLIT_USR
+ # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR