gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-06 06:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11210 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
DJ Lucas 2017-03-25 05:48:04 +00:00
parent d83fd51aa6
commit b875e19ed6
6 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootscripts/ChangeLog
View File

@ -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

12
bootscripts/lfs/init.d/rc
View File

@ -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)

1
bootscripts/lfs/lib/services/init-functions
View File

@ -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

11
chapter01/changelog.xml
View File

@ -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>

6
general.ent
View File

@ -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">

2
packages.ent
View File

@ -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">