Changeset edd83dc for bootscripts/lfs/lib/services/init-functions

Timestamp:

03/31/2021 10:41:41 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

9da9d014

Parents:

402226e

git-author:

Thomas Trepl <thomas@…> (02/01/2021 08:37:19 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:41 AM)

Message:

Merge changes from trunk to multilib

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@12107 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• bootscripts/lfs/lib/services/init-functions (modified) (3 diffs)

bootscripts/lfs/lib/services/init-functions

@@ -359 +359 @@
             progname=`echo "${program}" | sed "s@${prefix}@@"`
 
-            if [ -e "/var/run/${progname}.pid" ]; then
-                rm -f "/var/run/${progname}.pid" 2> /dev/null
+            if [ -e "/run/${progname}.pid" ]; then
+                rm -f "/run/${progname}.pid" 2> /dev/null
             fi
         else
@@ -435 +435 @@
 
         # If a PID file exists with that name, assume that is it.
-        if [ -e "/var/run/${progname}.pid" ]; then
-            pidfile="/var/run/${progname}.pid"
+        if [ -e "/run/${progname}.pid" ]; then
+            pidfile="/run/${progname}.pid"
         fi
     fi
@@ -529 +529 @@
          "ID(s) ${pidlist}.${NORMAL}"
    else
-      if [ -n "${base}" -a -e "/var/run/${base}.pid" ]; then
+      if [ -n "${base}" -a -e "/run/${base}.pid" ]; then
          /bin/echo -e "${WARNING}${1} is not running but" \
-            "/var/run/${base}.pid exists.${NORMAL}"
+            "/run/${base}.pid exists.${NORMAL}"
       else
          if [ -n "${pidfile}" -a -e "${pidfile}" ]; then