Changeset 5cf7fc1

Timestamp:

10/22/2011 03:30:16 AM (13 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

946e599

Parents:

800f6ea

Message:

Fix statusproc in init-functions

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9640 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

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

bootscripts/lfs/lib/services/init-functions

@@ -471 +471 @@
 #         pathname, path to the specified program                              #
 #                                                                              #
+# Note: Output to stdout.  Not logged.                                         #
+#                                                                              #
 # Return values:                                                               #
 #       0 - Status printed                                                     #
@@ -482 +484 @@
    fi
 
-   if [ -z "${PIDFILE}" ]; then
-      pidlist=`pidofproc -p "${PIDFILE}" $@`
+    local pidfile
+    local pidlist
+
+    # Process arguments
+    while true; do
+      case "${1}" in
+
+          -p)
+              pidfile="${2}"
+              shift 2
+              ;;
+      esac
+   done
+
+   if [ -z "${pidfile}" ]; then
+      pidlist=`pidofproc -p "${pidfile}" $@`
    else
       pidlist=`pidofproc $@`
@@ -501 +517 @@
             "/var/run/${base}.pid exists.${NORMAL}"
       else
-         if [ -n "${PIDFILE}" -a -e "${PIDFILE}" ]; then
+         if [ -z "${pidlist}" -a -n "${pidfile}" ]; then
             echo -e "${WARNING}${1} is not running" \
-               "but ${PIDFILE} exists.${NORMAL}"
+               "but ${pidfile} exists.${NORMAL}"
          else
             echo -e "${INFO}${1} is not running.${NORMAL}"