irqbalance: remove local patch for socket directory
authorHannu Nyman <hannu.nyman@iki.fi>
Sat, 4 Jun 2022 11:12:28 +0000 (14:12 +0300)
committerHannu Nyman <hannu.nyman@iki.fi>
Sun, 5 Jun 2022 17:04:07 +0000 (20:04 +0300)
Upstream has finally patched the UI communication socket
creation to happen only if the irqbalance UI is enabled.

As we do not use the irqbalance UI, we can remove
our local fix implemented by 4f0c847828.
(If you want to enable irqbalance UI, the fix is still needed.)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 8e71e0ad972ddb105264bdce3fffd0622edbd59b)

utils/irqbalance/files/irqbalance.init
utils/irqbalance/patches/110-fix-runtime-socket-directory.patch [deleted file]

index 0f587e1580f25f788590af239b79a5ea3cca7a51..638dcb39f65ae4973424495926f795da6b74b366 100644 (file)
@@ -16,8 +16,6 @@ start_service() {
        config_get_bool enabled irqbalance enabled 0
        [ "$enabled" -gt 0 ] || return 0
 
-       mkdir -p /var/run/irqbalance
-
        # 10 is the default
        config_get interval irqbalance interval 10
 
diff --git a/utils/irqbalance/patches/110-fix-runtime-socket-directory.patch b/utils/irqbalance/patches/110-fix-runtime-socket-directory.patch
deleted file mode 100644 (file)
index 036c7a4..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/irqbalance.h
-+++ b/irqbalance.h
-@@ -165,7 +165,7 @@ extern unsigned int log_mask;
- #endif /* HAVE_LIBSYSTEMD */
- #define SOCKET_PATH "irqbalance"
--#define SOCKET_TMPFS "/run/irqbalance"
-+#define SOCKET_TMPFS "/var/run/irqbalance"
- extern int process_one_line(char *path, void (*cb)(char *line, void *data), void *data);
- extern void get_mask_from_bitmap(char *line, void *mask);
---- a/ui/irqbalance-ui.h
-+++ b/ui/irqbalance-ui.h
-@@ -8,7 +8,7 @@
- #include <glib-unix.h>
- #define SOCKET_PATH "irqbalance"
--#define SOCKET_TMPFS "/run/irqbalance"
-+#define SOCKET_TMPFS "/var/run/irqbalance"
- #define STATS "stats"
- #define SET_SLEEP "settings sleep "