Skip to content

Commit

Permalink
irqbalance: fix socket directory and create it
Browse files Browse the repository at this point in the history
Irqbalance defines /run/irqbalance dir for its socket
communication between irqbalance and its UI. /run does not exist
in OpenWrt (although it is defined by the Linux FHS), so the
socket creation fails. Although we do not compile UI and thus
the issue is not critical to us, fix the directory location.

Additionally, the creation is originally handled by a systemd
init script that we do not use.

* patch source to define dir as /var/run/irqbalance
* create the dir in the procd init script.

Signed-off-by: Hannu Nyman <[email protected]>
  • Loading branch information
hnyman committed Jun 17, 2020
1 parent c8187f7 commit 4f0c847
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 1 deletion.
2 changes: 1 addition & 1 deletion utils/irqbalance/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=irqbalance
PKG_VERSION:=1.6.0
PKG_RELEASE:=9
PKG_RELEASE:=10

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_PROTO:=git
Expand Down
2 changes: 2 additions & 0 deletions utils/irqbalance/files/irqbalance.init
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ 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

Expand Down
22 changes: 22 additions & 0 deletions utils/irqbalance/patches/110-fix-runtime-socket-directory.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- a/irqbalance.h
+++ b/irqbalance.h
@@ -158,7 +158,7 @@ extern unsigned int log_mask;
#endif /* HAVE_LIBSYSTEMD */

#define SOCKET_PATH "irqbalance"
-#define SOCKET_TMPFS "/run/irqbalance/"
+#define SOCKET_TMPFS "/var/run/irqbalance/"

#endif /* __INCLUDE_GUARD_IRQBALANCE_H_ */

--- 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 "

3 comments on commit 4f0c847

@hanipouspilot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hnyman Will you backport it to 19.07 branch?

@hnyman
Copy link
Contributor Author

@hnyman hnyman commented on 4f0c847 Jun 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I backported it (and also the previous two commits, so that irqbalance in 19.07 is now equal to master)

@hanipouspilot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good. Thanks.

Please sign in to comment.