From 36d976cba68dd03f100f1efb1e88efbe264888c1 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 26 Apr 2021 13:06:50 +0000 Subject: [PATCH] /var/run is deprecated Systemd now wants PID files in /run, not /var/run. Service files have been updated upstream already, but not the path used by the actual programs. Change them too so that things don't break when the /var/run symlink is eventually dropped. References: bsc#1185183 --- prog/pwm/fancontrol | 2 +- prog/pwm/pwmconfig | 2 +- prog/sensord/args.c | 4 ++-- prog/sensord/sensord.8 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/prog/pwm/fancontrol b/prog/pwm/fancontrol index bf95e5a4..243e1a8e 100755 --- a/prog/pwm/fancontrol +++ b/prog/pwm/fancontrol @@ -38,7 +38,7 @@ # # -PIDFILE="/var/run/fancontrol.pid" +PIDFILE="/run/fancontrol.pid" #DEBUG=1 MAX=255 diff --git a/prog/pwm/pwmconfig b/prog/pwm/pwmconfig index 31d5a224..197e800c 100755 --- a/prog/pwm/pwmconfig +++ b/prog/pwm/pwmconfig @@ -30,7 +30,7 @@ # LM_VERSION='3.6.1+git' -PIDFILE="/var/run/fancontrol.pid" +PIDFILE="/run/fancontrol.pid" USERDIR=$(pwd) if [ -f "$PIDFILE" ] diff --git a/prog/sensord/args.c b/prog/sensord/args.c index 36e23865..59c01ad6 100644 --- a/prog/sensord/args.c +++ b/prog/sensord/args.c @@ -33,7 +33,7 @@ #include "version.h" struct sensord_arguments sensord_args = { - .pidFile = "/var/run/sensord.pid", + .pidFile = "/run/sensord.pid", .scanTime = 60, .logTime = 30 * 60, .rrdTime = 5 * 60, @@ -97,7 +97,7 @@ static const char *daemonSyntax = " -T, --rrd-no-average -- switch RRD in non-average mode\n" " -r, --rrd-file -- RRD file (default )\n" " -c, --config-file -- configuration file\n" - " -p, --pid-file -- PID file (default /var/run/sensord.pid)\n" + " -p, --pid-file -- PID file (default /run/sensord.pid)\n" " -f, --syslog-facility -- syslog facility to use (default local4)\n" " -g, --rrd-cgi -- output an RRD CGI script and exit\n" " -a, --load-average -- include load average in RRD file\n" diff --git a/prog/sensord/sensord.8 b/prog/sensord/sensord.8 index a300478f..bfbcc7df 100644 --- a/prog/sensord/sensord.8 +++ b/prog/sensord/sensord.8 @@ -86,7 +86,7 @@ configuration file is used. .IP "-p, --pid-file file" Specify what PID file to write; the default is to write the file -`/var/run/sensord.pid'. You should always specify an absolute path +`/run/sensord.pid'. You should always specify an absolute path here. The file is removed when the daemon exits. .IP "-f, --syslog-facility facility" Specify the