diff options
| -rw-r--r-- | bootscripts/ChangeLog | 6 | ||||
| -rw-r--r-- | bootscripts/lfs/lib/services/init-functions | 18 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 16 | ||||
| -rw-r--r-- | chapter08/glibc.xml | 6 | ||||
| -rw-r--r-- | packages.ent | 2 |
5 files changed, 40 insertions, 8 deletions
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 diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index a2e057b13..c588665bb 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,22 @@ --> <listitem> + <para>2021-04-28</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Add manual locales needed for tests + if using alternate locale installation instructions. Fixes + <ulink url="&lfs-ticket-root;4844">#4844</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Minor changes to boot scripts. Fixes + <ulink url="&lfs-ticket-root;4842">#4842</ulink>. + Thanks to Scott Andrews for the report.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2021-04-26</para> <itemizedlist> <listitem> diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index 6f99a94c5..7fc661dc2 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -280,7 +280,11 @@ localedef -i zh_HK -f BIG5-HKSCS zh_HK.BIG5-HKSCS</userinput></screen> <para>Then use the <command>localedef</command> command to create and install locales not listed in the <filename>glibc-&glibc-version;/localedata/SUPPORTED</filename> file - in the unlikely case you need them.</para> + when you need them. For instance, the following two locales are + needed for some tests later in this chapter:</para> + +<screen role="nodump"><userinput remap="locale-full">localedef -i POSIX -f UTF-8 C.UTF-8 2> /dev/null || true +localedef -i ja_JP -f SHIFT_JIS ja_JP.SIJS 2> /dev/null || true</userinput></screen> <note><para>Glibc now uses libidn2 when resolving internationalized domain names. This is a run time dependency. If this capability diff --git a/packages.ent b/packages.ent index b230ea0e9..67a838778 100644 --- a/packages.ent +++ b/packages.ent @@ -376,7 +376,7 @@ <!ENTITY less-fin-du "4.1 MB"> <!ENTITY less-fin-sbu "less than 0.1 SBU"> -<!ENTITY lfs-bootscripts-version "20210201"> <!-- Scripts depend on this format --> +<!ENTITY lfs-bootscripts-version "20210428"> <!-- Scripts depend on this format --> <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz"> <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> |