Changeset 4f3aa1c for chapter07

Timestamp:

02/23/2001 06:20:39 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:

0c7e9bd7

Parents:

b092e3d

Message:

Fixed the unnecessary delays in the killproc function

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

File:

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

chapter07/functions.xml

@@ -37 +37 @@
 evaluate_retval()
 {
-        if [ $? = 0 ]
-        then
-                print_status success
+        if [ $? = 0 ]
+        then
+                print_status success
         else
                 print_status failure
@@ -97 +97 @@
 #
 # If no parameters are given to the print_status function, print usage
+
 # information.
 
@@ -218 +219 @@
 
 # more PID's were found that belongs to the processes to be killed
+
 #
         if [ -n "$pid" ]
@@ -228 +230 @@
                 then
                         /bin/kill -TERM $pid
-/usr/bin/sleep 2
-#
-# If after -TERM the PID still exists we'll try killing it with -KILL
-# and wait for 2 seconds again to allow the kill to be completed
-#
- 
-                       if ps h $pid >/dev/null 2>&1
+#
+# If after -TERM the PID still exists we'll wait 2 seconds before
+# trying to kill it with -KILL. If the PID still exist after that, wait
+# two more seconds. If the PIDs still exist by then it's safe to assume
+# that we cannot kill these PIDs.
+#
+
+                        if /bin/ps h $pid >/dev/null 2>&1
                         then
-                                /bin/kill -KILL $pid
-/usr/bin/sleep 2
+                                /usr/bin/sleep 2
+                                if /bin/ps h $pid > /dev/null 2>&1
+                                then
+                                        /bin/kill -KILL $pid
+                                        if /bin/ps h $pid > /dev/null 2>&1
+                                        then
+                                                /usr/bin/sleep 2
+                                        fi
+                                fi
                         fi
-                        /bin/ps h $pid >/dev/null 2>&1
+                        /bin/ps h $pid >/dev/null 2>&1
                         if [ $? = 0 ]
                         then
@@ -262 +272 @@
 #
                         /bin/kill $killlevel $pid
-/usr/bin/sleep 2
-                        /bin/ps h $pid >/dev/null 2>&1
+                        if /bin/ps h $pid > /dev/null 2>&1
+                        then
+                                /usr/bin/sleep 2
+                        fi
+                        /bin/ps h $pid >/dev/null 2>&1
                         if [ $? = 0 ]
                         then
@@ -294 +307 @@
 # reload it's configuration file. This is almost identical to the
 # killproc function with the exception that it won't try to kill it with
+
 # a -KILL signal (aka -9)
 #
@@ -365 +379 @@
 #
 # If nolevel was set we will use the default reload signal SIGHUP.
+
 #