rhbz2041596: replace /var/run -> /run throughout

/var/run is "legacy" and one must reject legacy

diff --git a/initscript/99stap/start-staprun.sh b/initscript/99stap/start-staprun.sh
index b7184bda3cd7e0a469011e8ca3f3f3591b5ed7bb..2831f40f9bd9b4bbe15f6525323c86b68587115c 100644 (file)
--- a/initscript/99stap/start-staprun.sh
+++ b/initscript/99stap/start-staprun.sh
@@ -4,10 +4,10 @@
 
 . /etc/systemtap-params.conf
 
-# From here, we can access /var/run (or rather what it will link to),
+# From here, we can access /run (or rather what it will link to),
 # but because $STAT_PATH is user-configurable, we're not guaranteed that
-# it will be /var/run.  Regardless, we can't have access to the final
-# root so we make do and write to /var/run/systemtap anyway. The init
+# it will be /run.  Regardless, we can't have access to the final
+# root so we make do and write to /run/systemtap anyway. The init
 # script will take care of moving the PID files to the real directory if
 # necessary.
 PIDDIR=/run/systemtap

diff --git a/initscript/config.systemtap.in b/initscript/config.systemtap.in
index 9237b3b7a6c6e7e9463551e9ec8bc9cd8a38275b..df71dec8f2ad4ac89d691d6a05d2d7b50d9326bd 100644 (file)
--- a/initscript/config.systemtap.in
+++ b/initscript/config.systemtap.in
@@ -18,6 +18,6 @@
 # Start these scripts by default. If omitted, all scripts are started.
 # DEFAULT_START=
 
-# Log boot-time staprun stderr to /var/run/systemtap/$script.log
+# Log boot-time staprun stderr to /run/systemtap/$script.log
 # LOG_BOOT_ERR=no
 

diff --git a/initscript/systemtap.in b/initscript/systemtap.in
index b1621ae2fa25b1f8e4efc6685a524f33a9c135f7..f51638eee2fc4b07b500024825fcf1eeab3befde 100755 (executable)
--- a/initscript/systemtap.in
+++ b/initscript/systemtap.in
@@ -77,7 +77,7 @@ DEFAULT_START=
 # Allow cache only scripts
 ALLOW_CACHEONLY=no
 
-# Log boot-time staprun stderr to /var/run/systemtap/$script.log
+# Log boot-time staprun stderr to /run/systemtap/$script.log
 LOG_BOOT_ERR=no
 
 # Optional settings

diff --git a/man/cs/stappaths.7.in b/man/cs/stappaths.7.in
index eb8ca7631f8e5999a55f233a7cff5be2893661f6..a38e06cbcb4cb049919f746b88bd8abbe4ac8715 100644 (file)
--- a/man/cs/stappaths.7.in
+++ b/man/cs/stappaths.7.in
@@ -118,7 +118,7 @@ Globální konfigurační soubor programu stap\-server.
 @sysconfdir@/stap\-server/conf.d/*.conf
 Konfigurační soubory pro výchozí stap\-server služby.
 .TP
-/var/run/stap\-server/
+/run/stap\-server/
 Umístění "status" souborů pro běžící stap\-server služby.
 .TP
 /var/log/stap\-server/log

diff --git a/man/cs/systemtap.8.in b/man/cs/systemtap.8.in
index 3279c76f7eeef31414b0d3d03c1c63e9d02fe1a2..57815701b8e1bdceb13eafc1884c8f591298c7ab 100644 (file)
--- a/man/cs/systemtap.8.in
+++ b/man/cs/systemtap.8.in
@@ -224,7 +224,7 @@ se v cache.  Před startem služby je vhodné obsah cache zkontrolovat.
 .B LOG_BOOT_ERR
 Protože "boot-time" skripty se spouštějí dříve než je namountován kořenový
 souborový systém, nelze chybový výstup programy staprun posílat do LOG_FILE
-jak je obvyklé.  Nicméně log lze přesměrovat do /var/run/systemtap/$script.log
+jak je obvyklé.  Nicméně log lze přesměrovat do /run/systemtap/$script.log
 nastavením LOG_BOOT_ERR na \fByes\fR.  Pokud STAT_PATH je odlišná od výchozí
 hodnoty, budou logovací soubory přesunuty na požadované místo dříve, než se
 spustí jakýkoliv příkaz služby.  Výchozí hodnota je \fBno\fR.

diff --git a/man/systemtap-service.8.in b/man/systemtap-service.8.in
index 73acddddbcf6a70c522501bcfe886d81c8c90e42..2c78ec909ba67fddb544e1770d6503dc003bdc8f 100644 (file)
--- a/man/systemtap-service.8.in
+++ b/man/systemtap-service.8.in
@@ -240,7 +240,7 @@ The cache directory should be checked before enabling this option.
 .B LOG_BOOT_ERR
 Because boot-time scripts are run before the root filesystem is mounted,
 staprun's stderr cannot be logged to the LOG_FILE as usual. However, the log
-can instead be output to /var/run/systemtap/$script.log by setting LOG_BOOT_ERR
+can instead be output to /run/systemtap/$script.log by setting LOG_BOOT_ERR
 to \fByes\fR. If STAT_PATH is different from the default, the log files will be
 moved there upon executing any of the initscript commands. The default is
 \fBno\fR.

diff --git a/stap-server.conf b/stap-server.conf
index 37fbbc5a3c8440cb5c5051b51ae1d98e120ac0ad..be8002cc8d1eb07ab14bebe0efbd2f15cad4e61b 100644 (file)
--- a/stap-server.conf
+++ b/stap-server.conf
@@ -1 +1 @@
-D /var/run/stap-server 0755 stap-server stap-server -
\ No newline at end of file
+D /run/stap-server 0755 stap-server stap-server -

diff --git a/staprun/guest/stapsh-daemon.in b/staprun/guest/stapsh-daemon.in
index e1cb75b7785375dfbca82034b98eb236338d87c9..096008f45d55703da1108df893f17a05b8f40271 100755 (executable)
--- a/staprun/guest/stapsh-daemon.in
+++ b/staprun/guest/stapsh-daemon.in
@@ -11,8 +11,8 @@ if [ ! -n "$1" ]; then
    exit 1
 fi
 
-STAPSH_PID=/var/run/stapsh.$(basename $1).pid
-STAPSHD_PID=/var/run/stapshd.$(basename $1).pid
+STAPSH_PID=/run/stapsh.$(basename $1).pid
+STAPSHD_PID=/run/stapshd.$(basename $1).pid
 
 # Make sure the port exists
 if [ ! -c "$1" ]; then

diff --git a/staprun/guest/stapshd.in b/staprun/guest/stapshd.in
index c9bebb5b964e5327b96b0e6513eba5a949e34c40..864e65a025fffe5c31a4265247821a6151520dbe 100755 (executable)
--- a/staprun/guest/stapshd.in
+++ b/staprun/guest/stapshd.in
@@ -30,7 +30,7 @@ ports() {
 count_missing() {
    missing=0
    for port in $(ports); do
-      if [ ! -f "/var/run/stapshd.$(basename $port).pid" ]; then
+      if [ ! -f "/run/stapshd.$(basename $port).pid" ]; then
          missing=$(expr $missing + 1)
       fi
    done
@@ -51,7 +51,7 @@ start() {
       return 0
    fi
    for port in $prts; do
-      pidfile="/var/run/stapshd.$(basename $port).pid"
+      pidfile="/run/stapshd.$(basename $port).pid"
       if [ ! -f "$pidfile" ]; then
          $STAPSHD "$port" &>/dev/null &
          echo $! > $pidfile
@@ -62,7 +62,7 @@ start() {
 
 # First stops stapshd instances and then the stapsh instances
 stop() {
-   for pidfile in /var/run/stapshd.$(basename $PORT_BASENAME).*.pid; do
+   for pidfile in /run/stapshd.$(basename $PORT_BASENAME).*.pid; do
       if [ -f "$pidfile" ]; then
          killproc -p $pidfile stapshd
       fi
@@ -71,7 +71,7 @@ stop() {
          rm $pidfile
       fi
    done
-   for pidfile in /var/run/stapsh.$(basename $PORT_BASENAME).*.pid; do
+   for pidfile in /run/stapsh.$(basename $PORT_BASENAME).*.pid; do
       if [ -f "$pidfile" ]; then
          killproc -p $pidfile stapsh
       fi
@@ -85,7 +85,7 @@ stop() {
 
 # Only restart if we're running
 condrestart() {
-   if [ -f "/var/run/stapshd.$(basename $PORT_BASENAME).*.pid" ]; then
+   if [ -f "/run/stapshd.$(basename $PORT_BASENAME).*.pid" ]; then
       stop
       start
    fi
@@ -112,8 +112,8 @@ status() {
 # Stops any stapshd instances that are still running for a non-existent port
 # and starts stapshd instances for any port that doesn't have one
 reload() {
-   for pidfile in /var/run/stapshd.$(basename $PORT_BASENAME).*.pid; do
-      chardev=$(basename $pidfile .pid) # trim /var/run and .pid
+   for pidfile in /run/stapshd.$(basename $PORT_BASENAME).*.pid; do
+      chardev=$(basename $pidfile .pid) # trim /run and .pid
       chardev=${chardev#stapshd.}       # trim leading 'stapshd.'
       if [ -f "$pidfile" -a ! -c "/dev/virtio-ports/$chardev" ]; then
          killproc -p $pidfile stapshd
@@ -123,8 +123,8 @@ reload() {
          fi
       fi
    done
-   for pidfile in /var/run/stapsh.$(basename $PORT_BASENAME).*.pid; do
-      chardev=$(basename $pidfile .pid) # trim /var/run and .pid
+   for pidfile in /run/stapsh.$(basename $PORT_BASENAME).*.pid; do
+      chardev=$(basename $pidfile .pid) # trim /run and .pid
       chardev=${chardev#stapsh.}        # trim leading 'stapsh.'
       if [ -f "$pidfile" -a ! -c "/dev/virtio-ports/$chardev" ]; then
          killproc -p $pidfile stapsh