From 49e360b9b52900bdda162467c1d01244379c093b Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 28 Apr 2021 16:40:51 -0500
Subject: Add manual locales needed for tests if using alternate locale
 installation instructions.

Minor changes to boot scripts.
---
 bootscripts/ChangeLog                       |  6 ++++++
 bootscripts/lfs/lib/services/init-functions | 18 ++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'bootscripts')

diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index f9e0a5ef4..24fc8319a 100644
--- a/bootscripts/ChangeLog
+++ b/bootscripts/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-28 Bruce Dubbs <bdubbs@linuxfromscratch.org>
+   * Make check_signal more robust. 
+   * Use a better methog for killproc to remove a dead pid file.
+   * Clarify what signals killproc accepts.
+   * Thanks to input an ddiscussion from Scott Andrews.
+
 2021-02-01 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    * Tweak mountfs to properly exit when an error is found.
 
diff --git a/bootscripts/lfs/lib/services/init-functions b/bootscripts/lfs/lib/services/init-functions
index 2e9b15b98..0a7ca4da1 100644
--- a/bootscripts/lfs/lib/services/init-functions
+++ b/bootscripts/lfs/lib/services/init-functions
@@ -283,7 +283,13 @@ killproc()
         1)
             # Program is not running, but an invalid pid file exists
             # Remove the pid file.
-            rm -f "${pidfile}"
+
+            progname=${program##*/}
+
+            if [[ -e "/run/${progname}.pid" ]]; then
+                pidfile="/run/${progname}.pid"
+                rm -f "${pidfile}"
+            fi
 
             # This is only a success if no signal was passed.
             if [ -n "${nosig}" ]; then
@@ -713,13 +719,13 @@ evaluate_retval()
 
 ################################################################################
 # check_signal()                                                               #
-# Usage: check_signal [ -{signal} | {signal} ]                                 #
+# Usage: check_signal [ -{signal} ]                                            #
 #                                                                              #
 # Purpose: Check for a valid signal.  This is not defined by any LSB draft,    #
 #          however, it is required to check the signals to determine if the    #
 #          signals chosen are invalid arguments to the other functions.        #
 #                                                                              #
-# Inputs: Accepts a single string value in the form or -{signal} or {signal}   #
+# Inputs: Accepts a single string value in the form of -{signal}               #
 #                                                                              #
 # Return values:                                                               #
 #       0 - Success (signal is valid                                           #
@@ -730,11 +736,11 @@ check_signal()
     local valsig
 
     # Add error handling for invalid signals
-    valsig="-ALRM -HUP -INT -KILL -PIPE -POLL -PROF -TERM -USR1 -USR2"
+    valsig=" -ALRM -HUP -INT -KILL -PIPE -POLL -PROF -TERM -USR1 -USR2"
     valsig="${valsig} -VTALRM -STKFLT -PWR -WINCH -CHLD -URG -TSTP -TTIN"
     valsig="${valsig} -TTOU -STOP -CONT -ABRT -FPE -ILL -QUIT -SEGV -TRAP"
     valsig="${valsig} -SYS -EMT -BUS -XCPU -XFSZ -0 -1 -2 -3 -4 -5 -6 -8 -9"
-    valsig="${valsig} -11 -13 -14 -15"
+    valsig="${valsig} -11 -13 -14 -15 "
 
     echo "${valsig}" | grep -- " ${1} " > /dev/null
 
@@ -765,7 +771,7 @@ check_sig_type()
     local valsig
 
     # The list of termination signals (limited to generally used items)
-    valsig="-ALRM -INT -KILL -TERM -PWR -STOP -ABRT -QUIT -2 -3 -6 -9 -14 -15"
+    valsig=" -ALRM -INT -KILL -TERM -PWR -STOP -ABRT -QUIT -2 -3 -6 -9 -14 -15 "
 
     echo "${valsig}" | grep -- " ${1} " > /dev/null
 
-- 
cgit v1.2.3-54-g00ecf