mirror of
https://git.linuxfromscratch.org/lfs.git
synced 2025-06-19 03:39:20 +01:00
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
This commit is contained in:
parent
d83fd51aa6
commit
b875e19ed6
@ -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>
|
2015-02-22 Bruce Dubbs <bdubbs@linuxfromscratch.org>
|
||||||
* Cosmetic changes to network scripts' output
|
* Cosmetic changes to network scripts' output
|
||||||
|
|
||||||
|
@ -37,12 +37,12 @@ check_script_status()
|
|||||||
# $i is set when called
|
# $i is set when called
|
||||||
if [ ! -f ${i} ]; then
|
if [ ! -f ${i} ]; then
|
||||||
log_warning_msg "${i} is not a valid symlink."
|
log_warning_msg "${i} is not a valid symlink."
|
||||||
continue
|
SCRIPT_STAT="1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -x ${i} ]; then
|
if [ ! -x ${i} ]; then
|
||||||
log_warning_msg "${i} is not executable, skipping."
|
log_warning_msg "${i} is not executable, skipping."
|
||||||
continue
|
SCRIPT_STAT="1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -150,6 +150,10 @@ if [ "${previous}" != "N" ]; then
|
|||||||
for i in $(ls -v /etc/rc.d/rc${runlevel}.d/K* 2> /dev/null)
|
for i in $(ls -v /etc/rc.d/rc${runlevel}.d/K* 2> /dev/null)
|
||||||
do
|
do
|
||||||
check_script_status
|
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]}
|
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
|
prev_start=/etc/rc.d/rc$previous.d/S[0-9][0-9]$suffix
|
||||||
@ -192,6 +196,10 @@ do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
check_script_status
|
check_script_status
|
||||||
|
if [ "${SCRIPT_STAT}" == "1" ]; then
|
||||||
|
SCRIPT_STAT="0"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
case ${runlevel} in
|
case ${runlevel} in
|
||||||
0|6)
|
0|6)
|
||||||
|
@ -53,6 +53,7 @@ SKIP_SUFFIX="${BRACKET}[${INFO} SKIP ${BRACKET}]${NORMAL}"
|
|||||||
|
|
||||||
BOOTLOG=/run/bootlog
|
BOOTLOG=/run/bootlog
|
||||||
KILLDELAY=3
|
KILLDELAY=3
|
||||||
|
SCRIPT_STAT="0"
|
||||||
|
|
||||||
# Set any user specified environment variables e.g. HEADLESS
|
# Set any user specified environment variables e.g. HEADLESS
|
||||||
[ -r /etc/sysconfig/rc.site ] && . /etc/sysconfig/rc.site
|
[ -r /etc/sysconfig/rc.site ] && . /etc/sysconfig/rc.site
|
||||||
|
@ -42,6 +42,17 @@
|
|||||||
<listitem revision="sysv"> or <listitem revision="systemd"> as
|
<listitem revision="sysv"> or <listitem revision="systemd"> as
|
||||||
appropriate for the entry or if needed the entire day's listitem.
|
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>
|
<listitem>
|
||||||
<para>2017-03-18</para>
|
<para>2017-03-18</para>
|
||||||
<itemizedlist>
|
<itemizedlist>
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
<!ENTITY version "SVN-20170318">
|
<!ENTITY version "SVN-20170325">
|
||||||
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
|
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
|
||||||
Change to x.y for release but not -rc releases -->
|
Change to x.y for release but not -rc releases -->
|
||||||
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
|
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
|
||||||
|
|
||||||
<!ENTITY versiond "20170318-systemd">
|
<!ENTITY versiond "20170325-systemd">
|
||||||
<!ENTITY short-versiond "systemd">
|
<!ENTITY short-versiond "systemd">
|
||||||
<!ENTITY generic-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 copyrightdate "1999-2017"><!-- jhalfs needs a literal dash, not – -->
|
||||||
<!ENTITY milestone "8.1">
|
<!ENTITY milestone "8.1">
|
||||||
|
@ -358,7 +358,7 @@
|
|||||||
<!ENTITY less-ch6-du "3.5 MB">
|
<!ENTITY less-ch6-du "3.5 MB">
|
||||||
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
|
<!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-size "BOOTSCRIPTS-SIZE KB">
|
||||||
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
|
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
|
||||||
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">
|
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">
|
||||||
|
Loading…
Reference in New Issue
Block a user