deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 10:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use /run instead of /var/run

Browse Source 
In FHS 3.0, /var/run is replaced by /run:

https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch05s13.html
This commit is contained in:
Thomas Renninger 2021-04-27 20:45:50 +02:00 committed by Alexander Amelkin
parent cd57365fc4
commit cdac4e07f7
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/bmc-snmp-proxy
View File

@ -27,7 +27,7 @@ TRAPD_BMC_CONF="${SNMPD_BMC_CONF_DIR}/snmptrapd.local.conf"
TRAPD_CONF="/etc/snmp/snmptrapd.conf" TRAPD_CONF="/etc/snmp/snmptrapd.conf"
LOCKFILE="/var/lock/subsys/bmc-snmp-proxy" LOCKFILE="/var/lock/subsys/bmc-snmp-proxy"
BMC_INFO="/var/run/bmc-info" BMC_INFO="/run/bmc-info"
IPMITOOL=`which ipmitool` IPMITOOL=`which ipmitool`

2
contrib/bmc-snmp-proxy.service
View File

@ -5,7 +5,7 @@ After=exchange-bmc-os-info.service
Requires=exchange-bmc-os-info.service Requires=exchange-bmc-os-info.service
PartOf=exchange-bmc-os-info.service PartOf=exchange-bmc-os-info.service
ConditionPathExists=/var/run/bmc-info ConditionPathExists=/run/bmc-info
[Service] [Service]
Type=oneshot Type=oneshot

6
contrib/exchange-bmc-os-info.init.redhat
View File

@ -12,10 +12,10 @@
# Description: Script to set OS information in the BMC; fetch BMC IP/URL # Description: Script to set OS information in the BMC; fetch BMC IP/URL
# and set in the OS for use by other scripts/user. # 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: # Example to launch BMC web-interface:
# # . /var/run/bmc-info # # . /run/bmc-info
# # xdg-open $BMC_URL # # xdg-open $BMC_URL
# #
# See here for details: # See here for details:
@ -42,7 +42,7 @@
############################################################################# #############################################################################
CONFIGFILE=/etc/sysconfig/exchange-bmc-os-info CONFIGFILE=/etc/sysconfig/exchange-bmc-os-info
IPMI_TOOL=/usr/bin/ipmitool 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' # BMC Manufacturer ID used in 'oem_set_os_version' and 'oem_get_bmc_url'
DELL="674" DELL="674"

2
contrib/ipmievd.init.debian
View File

@ -22,7 +22,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DESC="IPMI event daemon" DESC="IPMI event daemon"
NAME=ipmievd NAME=ipmievd
DAEMON=/usr/sbin/$NAME DAEMON=/usr/sbin/$NAME
PIDFILE=/var/run/$NAME.pid PIDFILE=/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME
# Gracefully exit if the package has been removed. # Gracefully exit if the package has been removed.

4
doc/ipmievd.8.in
View File

@ -174,7 +174,7 @@ Do NOT become a daemon, instead log all messages to stderr.
.TP .TP
\fIpidfile\fP=<\fBfilename\fR> \fIpidfile\fP=<\fBfilename\fR>
Save process ID to this file when in daemon mode. Defaults to 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). number -- defaults to 0).
.RE .RE
@ -197,7 +197,7 @@ Do NOT become a daemon, instead log all messages to stderr.
.TP .TP
\fIpidfile\fP=<\fBfilename\fR> \fIpidfile\fP=<\fBfilename\fR>
Save process ID to this file when in daemon mode. Defaults to 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). number -- defaults to 0).
.TP .TP
\fItimeout\fP=<\fBseconds\fR> \fItimeout\fP=<\fBseconds\fR>

2
lib/helper.c
View File

@ -54,7 +54,7 @@
#ifdef HAVE_PATHS_H #ifdef HAVE_PATHS_H
# include <paths.h> # include <paths.h>
#else #else
# define _PATH_VARRUN "/var/run/" # define _PATH_RUN "/run/"
#endif #endif
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>

6
src/ipmievd.c
View File

@ -54,8 +54,8 @@
# include <paths.h> # include <paths.h>
#endif #endif
#ifndef _PATH_VARRUN #ifndef _PATH_RUN
# define _PATH_VARRUN "/var/run/" # define _PATH_RUN "/run/"
#endif #endif
#ifdef IPMI_INTF_OPEN #ifdef IPMI_INTF_OPEN
@ -82,7 +82,7 @@
#include <ipmitool/ipmi_main.h> #include <ipmitool/ipmi_main.h>
#define WARNING_THRESHOLD 80 #define WARNING_THRESHOLD 80
#define DEFAULT_PIDFILE _PATH_VARRUN "ipmievd.pid" #define DEFAULT_PIDFILE _PATH_RUN "ipmievd.pid"
char pidfile[64]; char pidfile[64];
/* global variables */ /* global variables */