From 5f47073c88688b4b9a652f9f503be2a795a02994 Mon Sep 17 00:00:00 2001 From: Davin McCall Date: Wed, 22 May 2019 20:22:45 +1000 Subject: [PATCH] Use SYSCONTROLSOCKET for socket path in dinitctl/shutdown. Patches from vext01. --- src/dinitctl.cc | 7 ++++--- src/shutdown.cc | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/dinitctl.cc b/src/dinitctl.cc index 40590e2..ab58177 100644 --- a/src/dinitctl.cc +++ b/src/dinitctl.cc @@ -23,11 +23,12 @@ #include "dinit-client.h" #include "load-service.h" #include "dinit-util.h" +#include "mconfig.h" // dinitctl: utility to control the Dinit daemon, including starting and stopping of services. -// This utility communicates with the dinit daemon via a unix stream socket (/dev/initctl, -// or $HOME/.dinitctl). +// This utility communicates with the dinit daemon via a unix stream socket (as specified in +// SYSCONTROLSOCKET, or $HOME/.dinitctl). static constexpr uint16_t min_cp_version = 1; static constexpr uint16_t max_cp_version = 1; @@ -267,7 +268,7 @@ int main(int argc, char **argv) signal(SIGPIPE, SIG_IGN); - control_socket_path = "/dev/dinitctl"; + control_socket_path = SYSCONTROLSOCKET; // Locate control socket if (! sys_dinit) { diff --git a/src/shutdown.cc b/src/shutdown.cc index a04598f..c82af94 100644 --- a/src/shutdown.cc +++ b/src/shutdown.cc @@ -20,11 +20,12 @@ #include "service-constants.h" #include "dinit-client.h" #include "dinit-util.h" +#include "mconfig.h" #include "dasynq.h" // shutdown: shut down the system -// This utility communicates with the dinit daemon via a unix socket (/dev/initctl). +// This utility communicates with the dinit daemon via a unix socket (specified in SYSCONTROLSOCKET). static constexpr uint16_t min_cp_version = 1; static constexpr uint16_t max_cp_version = 1; @@ -337,7 +338,7 @@ int main(int argc, char **argv) return 1; } - const char *naddr = "/dev/dinitctl"; + const char *naddr = SYSCONTROLSOCKET; struct sockaddr_un name; name.sun_family = AF_UNIX; -- 2.25.1