diff options
| author | DJ Lucas <dj@linuxfromscratch.org> | 2017-03-25 05:48:04 +0000 |
|---|---|---|
| committer | DJ Lucas <dj@linuxfromscratch.org> | 2017-03-25 05:48:04 +0000 |
| commit | b875e19ed6d1dd5db6601c45639b9ce2a700c202 (patch) | |
| tree | bed48116f521c79dc62814c717343df274688132 /bootscripts | |
| parent | d83fd51aa6f128ff50898081761940f6c42136b9 (diff) | |
Update to lfs-bootscripts-20170825. Fix a scope issue in the rc script. Thanks to quesker in #lfs-support for the report and subsequent testing.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11210 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'bootscripts')
| -rw-r--r-- | bootscripts/ChangeLog | 4 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/rc | 12 | ||||
| -rw-r--r-- | bootscripts/lfs/lib/services/init-functions | 1 |
3 files changed, 15 insertions, 2 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 9600652ad..926f1485e 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,7 @@ +2017-03-25 DJ Lucas <dj@linuxfromscratch.org> + * Bash-4.4 changes no longer allow continue in function to pass to calling + loop. + 2015-02-22 Bruce Dubbs <bdubbs@linuxfromscratch.org> * Cosmetic changes to network scripts' output diff --git a/bootscripts/lfs/init.d/rc b/bootscripts/lfs/init.d/rc index 3e928a8f5..f27f5469c 100644 --- a/bootscripts/lfs/init.d/rc +++ b/bootscripts/lfs/init.d/rc @@ -37,12 +37,12 @@ check_script_status() # $i is set when called if [ ! -f ${i} ]; then log_warning_msg "${i} is not a valid symlink." - continue + SCRIPT_STAT="1" fi if [ ! -x ${i} ]; then log_warning_msg "${i} is not executable, skipping." - continue + SCRIPT_STAT="1" fi } @@ -150,6 +150,10 @@ if [ "${previous}" != "N" ]; then for i in $(ls -v /etc/rc.d/rc${runlevel}.d/K* 2> /dev/null) do check_script_status + if [ "${SCRIPT_STAT}" == "1" ]; then + SCRIPT_STAT="0" + continue + fi suffix=${i#/etc/rc.d/rc$runlevel.d/K[0-9][0-9]} prev_start=/etc/rc.d/rc$previous.d/S[0-9][0-9]$suffix @@ -192,6 +196,10 @@ do fi check_script_status + if [ "${SCRIPT_STAT}" == "1" ]; then + SCRIPT_STAT="0" + continue + fi case ${runlevel} in 0|6) diff --git a/bootscripts/lfs/lib/services/init-functions b/bootscripts/lfs/lib/services/init-functions index 87f0bc6bb..4e1c6356e 100644 --- a/bootscripts/lfs/lib/services/init-functions +++ b/bootscripts/lfs/lib/services/init-functions @@ -53,6 +53,7 @@ SKIP_SUFFIX="${BRACKET}[${INFO} SKIP ${BRACKET}]${NORMAL}" BOOTLOG=/run/bootlog KILLDELAY=3 +SCRIPT_STAT="0" # Set any user specified environment variables e.g. HEADLESS [ -r /etc/sysconfig/rc.site ] && . /etc/sysconfig/rc.site |