From 200af0c1b5e45dcd4af37d32d5b6bd7048517b6c Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Wed, 1 Feb 2012 13:23:55 +0100 Subject: [PATCH] move rpcbind.sock to /run when built with systemd support Signed-off-by: Tom Gundersen --- src/rpcbind.c | 5 +++++ systemd/rpcbind.socket | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/rpcbind.c b/src/rpcbind.c index d47cfa8..995825e 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -92,7 +92,12 @@ char *rpcbinduser = NULL; /* who to suid to if -s is given */ #define RUN_AS "daemon" +#ifdef SYSTEMD +#define RPCBINDDLOCK "/run/rpcbind.lock" +#define _PATH_RPCBINDSOCK "/run/rpcbind.sock" +#else #define RPCBINDDLOCK "/var/run/rpcbind.lock" +#endif int runasdaemon = 0; int insecure = 0; diff --git a/systemd/rpcbind.socket b/systemd/rpcbind.socket index ad5fd62..eafb32c 100644 --- a/systemd/rpcbind.socket +++ b/systemd/rpcbind.socket @@ -4,7 +4,7 @@ Wants=rpcbind.target Before=rpcbind.target [Socket] -ListenStream=/var/run/rpcbind.sock +ListenStream=/run/rpcbind.sock ListenStream=111 ListenDatagram=111