From b875e19ed6d1dd5db6601c45639b9ce2a700c202 Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Sat, 25 Mar 2017 05:48:04 +0000
Subject: 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
---
 bootscripts/ChangeLog                       |  4 ++++
 bootscripts/lfs/init.d/rc                   | 12 ++++++++++--
 bootscripts/lfs/lib/services/init-functions |  1 +
 chapter01/changelog.xml                     | 11 +++++++++++
 general.ent                                 |  6 +++---
 packages.ent                                |  2 +-
 6 files changed, 30 insertions(+), 6 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
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 91ef6971f..dd1206dde 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,17 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2017-03-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - 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.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2017-03-18</para>
       <itemizedlist>
diff --git a/general.ent b/general.ent
index 2581c86be..8afce0f5a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20170318">
+<!ENTITY version         "SVN-20170325">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20170318-systemd">
+<!ENTITY versiond        "20170325-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "March 18, 2017">
+<!ENTITY releasedate     "March 25, 2017">
 
 <!ENTITY copyrightdate   "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.1">
diff --git a/packages.ent b/packages.ent
index aae3c2665..71fa78d83 100644
--- a/packages.ent
+++ b/packages.ent
@@ -358,7 +358,7 @@
 <!ENTITY less-ch6-du "3.5 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20170318">              <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20170325">              <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">        
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">  
-- 
cgit v1.2.3-54-g00ecf