libstoragemgmt/move_to_run.patch
Michael Vetter 4b03a7316a - Update to 1.9.6:
* Update the systemd run directory
- Refresh move_to_run.patch

OBS-URL: https://build.opensuse.org/package/show/Base:System/libstoragemgmt?expand=0&rev=87
2022-11-11 16:01:30 +00:00

84 lines
3.6 KiB
Diff

diff -urEbw libstoragemgmt-1.9.6/c_binding/lsm_datatypes.cpp libstoragemgmt-1.9.6.new/c_binding/lsm_datatypes.cpp
--- libstoragemgmt-1.9.6/c_binding/lsm_datatypes.cpp 2022-04-06 19:55:18.000000000 +0200
+++ libstoragemgmt-1.9.6.new/c_binding/lsm_datatypes.cpp 2022-11-11 16:55:27.674287708 +0100
@@ -51,7 +51,7 @@
#ifdef __cplusplus
extern "C" {
#endif
-#define LSM_DEFAULT_PLUGIN_DIR "/var/run/lsm/ipc"
+#define LSM_DEFAULT_PLUGIN_DIR "/run/lsm/ipc"
int lsm_string_list_append(lsm_string_list *sl, const char *value) {
int rc = LSM_ERR_INVALID_ARGUMENT;
diff -urEbw libstoragemgmt-1.9.6/daemon/lsm_daemon.c libstoragemgmt-1.9.6.new/daemon/lsm_daemon.c
--- libstoragemgmt-1.9.6/daemon/lsm_daemon.c 2022-04-06 19:55:18.000000000 +0200
+++ libstoragemgmt-1.9.6.new/daemon/lsm_daemon.c 2022-11-11 16:56:06.354471805 +0100
@@ -44,7 +44,7 @@
#include <syslog.h>
#include <unistd.h>
-#define BASE_DIR "/var/run/lsm"
+#define BASE_DIR "/run/lsm"
#define SOCKET_DIR BASE_DIR "/ipc"
#define PLUGIN_DIR "/usr/bin"
#define LSM_USER "libstoragemgmt"
diff -urEbw libstoragemgmt-1.9.6/packaging/daemon/libstoragemgmtd libstoragemgmt-1.9.6.new/packaging/daemon/libstoragemgmtd
--- libstoragemgmt-1.9.6/packaging/daemon/libstoragemgmtd 2022-03-15 23:38:45.000000000 +0100
+++ libstoragemgmt-1.9.6.new/packaging/daemon/libstoragemgmtd 2022-11-11 16:57:40.126918116 +0100
@@ -15,7 +15,7 @@
NAME=lsmd
PROG=/usr/bin/$NAME
-PID=/var/run/lsm/lsmd.pid
+PID=/run/lsm/lsmd.pid
LOCK=/var/lock/subsys/libstoragemgmtd
RETVAL=0
@@ -27,8 +27,8 @@
fi
check_dirs() {
- test -d /var/run/lsm || mkdir -p /var/run/lsm/ipc
- test -d /var/run/lsm/ipc || mkdir -p /var/run/lsm/ipc
+ test -d /run/lsm || mkdir -p /run/lsm/ipc
+ test -d /run/lsm/ipc || mkdir -p /run/lsm/ipc
}
status_lsm() {
diff -urEbw libstoragemgmt-1.9.6/packaging/libstoragemgmt.spec libstoragemgmt-1.9.6.new/packaging/libstoragemgmt.spec
--- libstoragemgmt-1.9.6/packaging/libstoragemgmt.spec 2022-11-08 16:20:12.000000000 +0100
+++ libstoragemgmt-1.9.6.new/packaging/libstoragemgmt.spec 2022-11-11 16:58:20.231109009 +0100
@@ -264,7 +264,7 @@
%pre
getent group libstoragemgmt >/dev/null || groupadd -r libstoragemgmt
getent passwd libstoragemgmt >/dev/null || \
- useradd -r -g libstoragemgmt -d /var/run/lsm -s /sbin/nologin \
+ useradd -r -g libstoragemgmt -d /run/lsm -s /sbin/nologin \
-c "daemon account for libstoragemgmt" libstoragemgmt
%post
diff -urEbw libstoragemgmt-1.9.6/packaging/libstoragemgmt.spec.in libstoragemgmt-1.9.6.new/packaging/libstoragemgmt.spec.in
--- libstoragemgmt-1.9.6/packaging/libstoragemgmt.spec.in 2022-04-06 19:55:18.000000000 +0200
+++ libstoragemgmt-1.9.6.new/packaging/libstoragemgmt.spec.in 2022-11-11 16:58:47.279237761 +0100
@@ -264,7 +264,7 @@
%pre
getent group libstoragemgmt >/dev/null || groupadd -r libstoragemgmt
getent passwd libstoragemgmt >/dev/null || \
- useradd -r -g libstoragemgmt -d /var/run/lsm -s /sbin/nologin \
+ useradd -r -g libstoragemgmt -d /run/lsm -s /sbin/nologin \
-c "daemon account for libstoragemgmt" libstoragemgmt
%post
diff -urEbw libstoragemgmt-1.9.6/python_binding/lsm/_common.py libstoragemgmt-1.9.6.new/python_binding/lsm/_common.py
--- libstoragemgmt-1.9.6/python_binding/lsm/_common.py 2022-04-06 19:55:18.000000000 +0200
+++ libstoragemgmt-1.9.6.new/python_binding/lsm/_common.py 2022-11-11 16:59:14.139365618 +0100
@@ -151,7 +151,7 @@
# variable in client and specified on the command line for the daemon
-UDS_PATH = '/var/run/lsm/ipc'
+UDS_PATH = '/run/lsm/ipc'
# Set to True for verbose logging
LOG_VERBOSE = True