summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.com>2021-04-27 20:45:50 +0200
committerAlexander Amelkin <mocbuhtig@amelkin.msk.ru>2021-06-22 23:45:59 +0300
commitcdac4e07f7daeb6d05fa8018e8db76e96725998d (patch)
tree90842c6b5b73dd67a7c0d790fe6a1bbb11be07a3
parentcd57365fc497fd310eed194d5ff0d6b9b26be514 (diff)
downloadipmitool-cdac4e07f7daeb6d05fa8018e8db76e96725998d.tar.gz
Use /run instead of /var/run
In FHS 3.0, /var/run is replaced by /run: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch05s13.html
-rw-r--r--contrib/bmc-snmp-proxy2
-rw-r--r--contrib/bmc-snmp-proxy.service2
-rw-r--r--contrib/exchange-bmc-os-info.init.redhat6
-rwxr-xr-xcontrib/ipmievd.init.debian2
-rw-r--r--doc/ipmievd.8.in4
-rw-r--r--lib/helper.c2
-rw-r--r--src/ipmievd.c6
7 files changed, 12 insertions, 12 deletions
diff --git a/contrib/bmc-snmp-proxy b/contrib/bmc-snmp-proxy
index fcb2ab8..9143c83 100644
--- a/contrib/bmc-snmp-proxy
+++ b/contrib/bmc-snmp-proxy
@@ -27,7 +27,7 @@ TRAPD_BMC_CONF="${SNMPD_BMC_CONF_DIR}/snmptrapd.local.conf"
TRAPD_CONF="/etc/snmp/snmptrapd.conf"
LOCKFILE="/var/lock/subsys/bmc-snmp-proxy"
-BMC_INFO="/var/run/bmc-info"
+BMC_INFO="/run/bmc-info"
IPMITOOL=`which ipmitool`
diff --git a/contrib/bmc-snmp-proxy.service b/contrib/bmc-snmp-proxy.service
index 247137a..b244b4d 100644
--- a/contrib/bmc-snmp-proxy.service
+++ b/contrib/bmc-snmp-proxy.service
@@ -5,7 +5,7 @@ After=exchange-bmc-os-info.service
Requires=exchange-bmc-os-info.service
PartOf=exchange-bmc-os-info.service
-ConditionPathExists=/var/run/bmc-info
+ConditionPathExists=/run/bmc-info
[Service]
Type=oneshot
diff --git a/contrib/exchange-bmc-os-info.init.redhat b/contrib/exchange-bmc-os-info.init.redhat
index b7ec43f..8975c2e 100644
--- a/contrib/exchange-bmc-os-info.init.redhat
+++ b/contrib/exchange-bmc-os-info.init.redhat
@@ -12,10 +12,10 @@
# Description: Script to set OS information in the BMC; fetch BMC IP/URL
# and set in the OS for use by other scripts/user.
#
-# BMC IP and URL are made available in /var/run/bmc-info
+# BMC IP and URL are made available in /run/bmc-info
#
# Example to launch BMC web-interface:
-# # . /var/run/bmc-info
+# # . /run/bmc-info
# # xdg-open $BMC_URL
#
# See here for details:
@@ -42,7 +42,7 @@
#############################################################################
CONFIGFILE=/etc/sysconfig/exchange-bmc-os-info
IPMI_TOOL=/usr/bin/ipmitool
-BMC_INFO=/var/run/bmc-info
+BMC_INFO=/run/bmc-info
# BMC Manufacturer ID used in 'oem_set_os_version' and 'oem_get_bmc_url'
DELL="674"
diff --git a/contrib/ipmievd.init.debian b/contrib/ipmievd.init.debian
index 1783d1a..1a2fc63 100755
--- a/contrib/ipmievd.init.debian
+++ b/contrib/ipmievd.init.debian
@@ -22,7 +22,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DESC="IPMI event daemon"
NAME=ipmievd
DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
# Gracefully exit if the package has been removed.
diff --git a/doc/ipmievd.8.in b/doc/ipmievd.8.in
index ab846e0..6792a0d 100644
--- a/doc/ipmievd.8.in
+++ b/doc/ipmievd.8.in
@@ -174,7 +174,7 @@ Do NOT become a daemon, instead log all messages to stderr.
.TP
\fIpidfile\fP=<\fBfilename\fR>
Save process ID to this file when in daemon mode. Defaults to
-/var/run/ipmievd.pid\fIN\fP (where \fIN\fP is the ipmi device
+/run/ipmievd.pid\fIN\fP (where \fIN\fP is the ipmi device
number -- defaults to 0).
.RE
@@ -197,7 +197,7 @@ Do NOT become a daemon, instead log all messages to stderr.
.TP
\fIpidfile\fP=<\fBfilename\fR>
Save process ID to this file when in daemon mode. Defaults to
-/var/run/ipmievd.pid\fIN\fP (where \fIN\fP is the ipmi device
+/run/ipmievd.pid\fIN\fP (where \fIN\fP is the ipmi device
number -- defaults to 0).
.TP
\fItimeout\fP=<\fBseconds\fR>
diff --git a/lib/helper.c b/lib/helper.c
index d3ae01b..2b73b03 100644
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -54,7 +54,7 @@
#ifdef HAVE_PATHS_H
# include <paths.h>
#else
-# define _PATH_VARRUN "/var/run/"
+# define _PATH_RUN "/run/"
#endif
#include <ipmitool/ipmi.h>
diff --git a/src/ipmievd.c b/src/ipmievd.c
index eeaa0c9..2c19887 100644
--- a/src/ipmievd.c
+++ b/src/ipmievd.c
@@ -54,8 +54,8 @@
# include <paths.h>
#endif
-#ifndef _PATH_VARRUN
-# define _PATH_VARRUN "/var/run/"
+#ifndef _PATH_RUN
+# define _PATH_RUN "/run/"
#endif
#ifdef IPMI_INTF_OPEN
@@ -82,7 +82,7 @@
#include <ipmitool/ipmi_main.h>
#define WARNING_THRESHOLD 80
-#define DEFAULT_PIDFILE _PATH_VARRUN "ipmievd.pid"
+#define DEFAULT_PIDFILE _PATH_RUN "ipmievd.pid"
char pidfile[64];
/* global variables */