[lfs-book] r11210 - in trunk/BOOK: . bootscripts bootscripts/lfs/init.d bootscripts/lfs/lib/services chapter01

dj at higgs.linuxfromscratch.org dj at higgs.linuxfromscratch.org
Fri Mar 24 22:48:05 PDT 2017


Author: dj
Date: Fri Mar 24 22:48:04 2017
New Revision: 11210

Log:
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.

Modified:
   trunk/BOOK/bootscripts/ChangeLog
   trunk/BOOK/bootscripts/lfs/init.d/rc
   trunk/BOOK/bootscripts/lfs/lib/services/init-functions
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/general.ent
   trunk/BOOK/packages.ent

Modified: trunk/BOOK/bootscripts/ChangeLog
==============================================================================
--- trunk/BOOK/bootscripts/ChangeLog	Sat Mar 18 15:47:45 2017	(r11209)
+++ trunk/BOOK/bootscripts/ChangeLog	Fri Mar 24 22:48:04 2017	(r11210)
@@ -1,3 +1,7 @@
+2017-03-25 DJ Lucas <dj at linuxfromscratch.org>
+   * Bash-4.4 changes no longer allow continue in function to pass to calling
+     loop.
+
 2015-02-22 Bruce Dubbs <bdubbs at linuxfromscratch.org>
    * Cosmetic changes to network scripts' output
 

Modified: trunk/BOOK/bootscripts/lfs/init.d/rc
==============================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/rc	Sat Mar 18 15:47:45 2017	(r11209)
+++ trunk/BOOK/bootscripts/lfs/init.d/rc	Fri Mar 24 22:48:04 2017	(r11210)
@@ -37,12 +37,12 @@
    # $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 @@
    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 @@
    fi
 
    check_script_status
+      if [ "${SCRIPT_STAT}" == "1" ]; then
+         SCRIPT_STAT="0"
+         continue
+      fi
 
    case ${runlevel} in
       0|6)

Modified: trunk/BOOK/bootscripts/lfs/lib/services/init-functions
==============================================================================
--- trunk/BOOK/bootscripts/lfs/lib/services/init-functions	Sat Mar 18 15:47:45 2017	(r11209)
+++ trunk/BOOK/bootscripts/lfs/lib/services/init-functions	Fri Mar 24 22:48:04 2017	(r11210)
@@ -53,6 +53,7 @@
 
 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

Modified: trunk/BOOK/chapter01/changelog.xml
==============================================================================
--- trunk/BOOK/chapter01/changelog.xml	Sat Mar 18 15:47:45 2017	(r11209)
+++ trunk/BOOK/chapter01/changelog.xml	Fri Mar 24 22:48:04 2017	(r11210)
@@ -43,6 +43,17 @@
     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>
         <listitem>

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Sat Mar 18 15:47:45 2017	(r11209)
+++ trunk/BOOK/general.ent	Fri Mar 24 22:48:04 2017	(r11210)
@@ -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 – -->
 <!ENTITY milestone       "8.1">

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent	Sat Mar 18 15:47:45 2017	(r11209)
+++ trunk/BOOK/packages.ent	Fri Mar 24 22:48:04 2017	(r11210)
@@ -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">  


More information about the lfs-book mailing list