diff --git a/cpacfstats/cpacfstats.1 b/cpacfstats/cpacfstats.1 index ed5e77ba..407bbe00 100644 --- a/cpacfstats/cpacfstats.1 +++ b/cpacfstats/cpacfstats.1 @@ -110,7 +110,7 @@ The default command is --print all. . .SH FILES .nf -/var/run/cpacfstatsd_socket +/run/cpacfstatsd_socket .fi . .SH RETURN VALUE diff --git a/cpacfstats/cpacfstats.h b/cpacfstats/cpacfstats.h index 77102bbd..09b4680e 100644 --- a/cpacfstats/cpacfstats.h +++ b/cpacfstats/cpacfstats.h @@ -78,8 +78,8 @@ struct msg_answer { #define BACKLOG 10 -#define SOCKET_FILE "/var/run/cpacfstatsd_socket" -#define PID_FILE "/var/run/cpacfstatsd.pid" +#define SOCKET_FILE "/run/cpacfstatsd_socket" +#define PID_FILE "/run/cpacfstatsd.pid" #define CPACFSTATS_GROUP "cpacfstats" diff --git a/cpacfstats/cpacfstatsd.8 b/cpacfstats/cpacfstatsd.8 index dea2c2ed..9df97725 100644 --- a/cpacfstats/cpacfstatsd.8 +++ b/cpacfstats/cpacfstatsd.8 @@ -47,7 +47,7 @@ restart the daemon to ensure correct summing of the per-CPU performance counters. The starting daemon first checks for any stale pid file -/var/run/cpacfstatsd.pid. If this file exists, and the process ID in the +/run/cpacfstatsd.pid. If this file exists, and the process ID in the file belongs to an active process, an error message is printed to the console and the program terminates. @@ -81,8 +81,8 @@ daemon startup and initialization failures. .SH FILES .nf -/var/run/cpacfstatsd_socket -/var/run/cpacfstatsd.pid +/run/cpacfstatsd_socket +/run/cpacfstatsd.pid .fi .SH RETURN VALUE diff --git a/cpuplugd/cpuplugd.h b/cpuplugd/cpuplugd.h index 673054ef..f773ce8b 100644 --- a/cpuplugd/cpuplugd.h +++ b/cpuplugd/cpuplugd.h @@ -27,7 +27,7 @@ #define NAME "cpuplugd" #define MAX_HISTORY 100 -#define PIDFILE "/var/run/cpuplugd.pid" +#define PIDFILE "/run/cpuplugd.pid" #define LOCKFILE "/var/lock/cpuplugd.lock" #define PROCINFO_LINE 512 #define CPUSTAT_SIZE 1024 diff --git a/etc/init.d/cpacfstatsd b/etc/init.d/cpacfstatsd index 23c51691..63e7d1dc 100755 --- a/etc/init.d/cpacfstatsd +++ b/etc/init.d/cpacfstatsd @@ -13,7 +13,7 @@ DAEMON=cpacfstatsd DAEMON_PATH=/usr/sbin/cpacfstatsd -RUN_PID_FILE=/var/run/cpacfstatsd.pid +RUN_PID_FILE=/run/cpacfstatsd.pid RETVAL=0 OPTIONS="" diff --git a/etc/init.d/cpuplugd b/etc/init.d/cpuplugd index bac3e366..4d3576c0 100755 --- a/etc/init.d/cpuplugd +++ b/etc/init.d/cpuplugd @@ -17,7 +17,7 @@ DAEMON=cpuplugd DAEMON_PATH=/usr/sbin/cpuplugd CONFIG_FILE=/etc/cpuplugd.conf -RUN_PID_FILE=/var/run/cpuplugd.pid +RUN_PID_FILE=/run/cpuplugd.pid RETVAL=0 OPTIONS="-c $CONFIG_FILE" diff --git a/etc/init.d/dumpconf b/etc/init.d/dumpconf index 70160937..f04c719a 100755 --- a/etc/init.d/dumpconf +++ b/etc/init.d/dumpconf @@ -22,7 +22,7 @@ DUMP_CONFIG_FILE=/etc/sysconfig/dumpconf CMDFULL=$0 CMD="dumpconf" LOCKFILE=/var/lock/$CMD -PIDFILE=/var/run/$CMD.pid +PIDFILE=/run/$CMD.pid ERRMSG="Check $DUMP_CONFIG_FILE!" RETVAL=0 diff --git a/etc/init.d/mon_statd b/etc/init.d/mon_statd index 902c38ec..90bd5656 100755 --- a/etc/init.d/mon_statd +++ b/etc/init.d/mon_statd @@ -20,8 +20,8 @@ PROCD=mon_procd FSSTATD_PATH=/usr/sbin/$FSSTATD PROCD_PATH=/usr/sbin/$PROCD CONFIG_FILE=/etc/sysconfig/$DAEMON -FSSTATD_PID_FILE=/var/run/$FSSTATD.pid -PROCD_PID_FILE=/var/run/$PROCD.pid +FSSTATD_PID_FILE=/run/$FSSTATD.pid +PROCD_PID_FILE=/run/$PROCD.pid # source function library . /lib/lsb/init-functions diff --git a/mon_tools/mon_fsstatd.c b/mon_tools/mon_fsstatd.c index 19f2323c..a387460d 100644 --- a/mon_tools/mon_fsstatd.c +++ b/mon_tools/mon_fsstatd.c @@ -32,7 +32,7 @@ static char small_mon_record[SMALL_MON_RECORD_LEN]; static char large_mon_record[LARGE_MON_RECORD_LEN]; static long sample_interval = 60; -static const char *pid_file = "/var/run/mon_fsstatd.pid"; +static const char *pid_file = "/run/mon_fsstatd.pid"; struct mw_name_lens { __u16 mw_name_len; diff --git a/mon_tools/mon_procd.c b/mon_tools/mon_procd.c index e242cc29..5bf741e4 100644 --- a/mon_tools/mon_procd.c +++ b/mon_tools/mon_procd.c @@ -59,7 +59,7 @@ static char buf[BUF_SIZE]; static char mon_record[MAX_REC_LEN]; static long sample_interval = 60; -static const char *pid_file = "/var/run/mon_procd.pid"; +static const char *pid_file = "/run/mon_procd.pid"; /* * Clean up when SIGTERM or SIGINT received diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh index f3d7f433..8f8d4c6e 100755 --- a/scripts/dbginfo.sh +++ b/scripts/dbginfo.sh @@ -312,7 +312,7 @@ LOGFILES="\ /var/log/yum.log\ /var/log/openvswitch/ovs-vswitchd.log\ /var/log/openvswitch/ovsdb-server.log\ - /var/run/docker/libcontainerd/containerd/events.log\ + /run/docker/libcontainerd/containerd/events.log\ /run/containerd/events.log\ " diff --git a/systemd/cpacfstatsd.service.in b/systemd/cpacfstatsd.service.in index 020927fe..d5c49e83 100644 --- a/systemd/cpacfstatsd.service.in +++ b/systemd/cpacfstatsd.service.in @@ -15,7 +15,7 @@ ConditionVirtualization=no [Service] Type=forking ExecStart=@usrsbin_path@/cpacfstatsd -PIDFile=/var/run/cpacfstatsd.pid +PIDFile=/run/cpacfstatsd.pid KillMode=process Restart=no diff --git a/systemd/cpuplugd.service.in b/systemd/cpuplugd.service.in index 0d657b00..12fa13ce 100644 --- a/systemd/cpuplugd.service.in +++ b/systemd/cpuplugd.service.in @@ -17,7 +17,7 @@ ExecStart=@usrsbin_path@/cpuplugd -c @sysconf_path@/cpuplugd.conf ExecReload=/bin/kill -HUP $MAINPID KillMode=process Type=forking -PIDFile=/var/run/cpuplugd.pid +PIDFile=/run/cpuplugd.pid [Install] WantedBy=multi-user.target diff --git a/systemd/mon_fsstatd.service.in b/systemd/mon_fsstatd.service.in index 00bb4fe0..8620d3b8 100644 --- a/systemd/mon_fsstatd.service.in +++ b/systemd/mon_fsstatd.service.in @@ -34,7 +34,7 @@ ExecStart=@usrsbin_path@/mon_fsstatd -i $FSSTAT_INTERVAL ExecReload=/bin/kill -HUP $MAINPID KillMode=process Type=forking -PIDFile=/var/run/mon_fsstatd.pid +PIDFile=/run/mon_fsstatd.pid [Install] WantedBy=multi-user.target diff --git a/systemd/mon_procd.service.in b/systemd/mon_procd.service.in index 14c0ab25..512e584a 100644 --- a/systemd/mon_procd.service.in +++ b/systemd/mon_procd.service.in @@ -34,7 +34,7 @@ ExecStart=@usrsbin_path@/mon_procd -i $PROC_INTERVAL ExecReload=/bin/kill -HUP $MAINPID KillMode=process Type=forking -PIDFile=/var/run/mon_procd.pid +PIDFile=/run/mon_procd.pid [Install] WantedBy=multi-user.target diff --git a/ziomon/ziomon b/ziomon/ziomon index 87c4bc48..899e77d5 100755 --- a/ziomon/ziomon +++ b/ziomon/ziomon @@ -405,7 +405,7 @@ function check_cpuplugd { # check if cpuplugd is running # If so, the whole per-cpu mechanism of blktrace gets corrupted, which # results in the infamous 'bad trace magic' message - if [ -e /var/run/cpuplugd.pid ]; then + if [ -e /run/cpuplugd.pid ]; then echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; echo "$WRP_TOOLNAME: Warning: cpuplugd is running which can corrupt the traces."; echo " It is recommended to stop cpuplugd for the duration of the";