Changeset f45bf82 for chapter07

Timestamp:

06/22/2001 09:00:46 PM (23 years ago)

Author:

Gerard Beekmans <gerard@…>

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, 6.0, 6.1, 6.1.1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 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, v3_0, v3_1, v3_2, v3_3, v4_0, v4_1, v5_0, v5_1, v5_1_1, 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:

e87f37a9

Parents:

4e90962

Message:

Added [ ATTN ] warning message. instead of printing failed when a daemon
was already running, or already stopped, it'll now print "already
running [ attn ]" or "not running [ attn ]" in green characters

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

File:

• chapter07/functions.xml (modified) (13 diffs)

chapter07/functions.xml

@@ -21 +21 @@
 
 COL=70
+WCOL=50
 SET_COL="echo -en \\033[${COL}G"
+SET_WCOL="echo -en \\033[${WCOL}G"
 NORMAL="echo -en \\033[0;39m"
 SUCCESS="echo -en \\033[1;32m"
+WARNING="echo -en \\033[1;33m"
 FAILURE="echo -en \\033[1;31m"
 
@@ -73 +76 @@
                         $NORMAL
                         echo "  ]"
+                        ;;
+                warning)
+                        $SET_COL
+                        echo -n "[ "
+                        $WARNING
+                        echo -n "ATTN"
+                        $NORMAL
+                        echo " ]"
                         ;;
                 failure)
@@ -141 +152 @@
 # return value
 #
+
                 $*
                 evaluate_retval
         else
 #
-# The variable $pid was not empty, meaning it was already running. We
-# print [FAILED] now
-#
-                print_status failure
+# The variable $pid was not empty, meaning it was already running. We'll
+# print [ ATTN ] now
+#
+
+                $SET_WCOL
+                echo -n "Already running"
+                print_status warning
         fi
 
@@ -216 +231 @@
 # more PID's were found that belongs to the processes to be killed
 #
+
         if [ -n "$pid" ]
         then
+
 #
 # If no kill level was specified we'll try -TERM first and then sleep
 # for 2 seconds to allow the kill to be completed
 #
+
                 if [ "$nolevel" = 1 ]
                 then
                         /bin/kill -TERM $pid
+
 #
 # If after -TERM the PID still exists we'll wait 2 seconds before
@@ -251 +270 @@
 # and we'll print [FAILED]
 #
+
                                 print_status failure
                         else
+
 #
 # It was killed, remove possible stale PID file in /var/run and 
 # print [  OK  ]
 #
+
                                 /bin/rm -f /var/run/$base.pid
                                 print_status success
                         fi
                 else
+
 #
 # A kill level was provided. Kill with the provided kill level and wait
 # for 2 seconds to allow the kill to be completed
 #
+
                         /bin/kill $killlevel $pid
                         if /bin/ps h $pid > /dev/null 2>&1
@@ -273 +297 @@
                         if [ $? = 0 ]
                         then
+
 #
 # If ps' return value is 0 it means it ran ok which indicates that the
@@ -278 +303 @@
 # the signal provided. Print [FAILED]
 #
+
                                 print_status failure
                         else
+
 #
 # If the return value was 1 or higher it means the PID didn't exist
@@ -285 +312 @@
 # PID file and print [  OK  ]
 #
+
                                 /bin/rm -f /var/run/$base.pid
                                 print_status success
@@ -290 +318 @@
                 fi
         else
-#
-# The PID didn't exist so we can't attempt to kill it. Print [FAILED]
-#
-                print_status failure
+
+#
+# The PID didn't exist so we can't attempt to kill it. Print [ ATTN ]
+#
+
+                $SET_WCOL
+                echo -n "Not running"
+                print_status warning
         fi
 }
@@ -333 +365 @@
 #
 
-
         if [ -n "$2" ]
         then
@@ -376 +407 @@
                         evaluate_retval
                 else
+
 #
 # Else we will use the provided signal
@@ -384 +416 @@
                 fi
         else
-#
-# If $pid is empty no PID's have been found that belong to the process
-# and print [FAILED]
-#
-
-                print_status failure
+
+#
+# If $pid is empty no PID's have been found that belong to the process.
+# Print [ ATTN ]
+#
+
+                $SET_WCOL
+                echo -n "Not running"
+                print_status warning
         fi
 }
@@ -419 +454 @@
         if [ -n "$pid" ]
         then
+
 #
 # If $pid contains something, the process is running, print the contents
 # of the $pid variable
 #
+
                 echo "$1 running with Process ID $pid"
                 return 0