Author: bdubbs
Date: Fri May 24 12:06:18 2019
New Revision: 11610
Log:
Cosmetic changes to LFS bootscripts.
Modified:
trunk/BOOK/bootscripts/lfs/lib/services/init-functions
trunk/BOOK/bootscripts/lfs/lib/services/ipv4-static
trunk/BOOK/bootscripts/lfs/sbin/ifup
trunk/BOOK/bootscripts/lfs/sysconfig/rc.site
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter01/whatsnew.xml
trunk/BOOK/general.ent
trunk/BOOK/packages.ent
Modified: trunk/BOOK/bootscripts/lfs/lib/services/init-functions
==============================================================================
--- trunk/BOOK/bootscripts/lfs/lib/services/init-functions Wed May 22
15:00:40 2019 (r11609)
+++ trunk/BOOK/bootscripts/lfs/lib/services/init-functions Fri May 24
12:06:18 2019 (r11610)
@@ -40,11 +40,11 @@
BRACKET="\\033[1;34m" # Brackets are blue
# Use a colored prefix
-BMPREFIX=" "
-SUCCESS_PREFIX="${SUCCESS} * ${NORMAL}"
-FAILURE_PREFIX="${FAILURE}*****${NORMAL}"
-WARNING_PREFIX="${WARNING} *** ${NORMAL}"
-SKIP_PREFIX="${INFO} S ${NORMAL}"
+BMPREFIX=" "
+SUCCESS_PREFIX="${SUCCESS} * ${NORMAL} "
+FAILURE_PREFIX="${FAILURE}*****${NORMAL} "
+WARNING_PREFIX="${WARNING} *** ${NORMAL} "
+SKIP_PREFIX="${INFO} S ${NORMAL}"
SUCCESS_SUFFIX="${BRACKET}[${SUCCESS} OK ${BRACKET}]${NORMAL}"
FAILURE_SUFFIX="${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}"
Modified: trunk/BOOK/bootscripts/lfs/lib/services/ipv4-static
==============================================================================
--- trunk/BOOK/bootscripts/lfs/lib/services/ipv4-static Wed May 22 15:00:40
2019 (r11609)
+++ trunk/BOOK/bootscripts/lfs/lib/services/ipv4-static Fri May 24 12:06:18
2019 (r11610)
@@ -47,12 +47,6 @@
case "${2}" in
up)
if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP}/)" = "" ]; then
-
- # Cosmetic output
- if ! $(echo ${SERVICE} | grep -q " "); then
- log_info_msg2 "\n" # Terminate the previous message
- fi
-
log_info_msg "Adding IPv4 address ${IP} to the ${1} interface..."
ip addr add ${args} dev ${1}
evaluate_retval
Modified: trunk/BOOK/bootscripts/lfs/sbin/ifup
==============================================================================
--- trunk/BOOK/bootscripts/lfs/sbin/ifup Wed May 22 15:00:40 2019
(r11609)
+++ trunk/BOOK/bootscripts/lfs/sbin/ifup Fri May 24 12:06:18 2019
(r11610)
@@ -7,6 +7,7 @@
# Authors : Nathan Coulson - [email protected]
# Kevin P. Fleming - [email protected]
# Update : Bruce Dubbs - [email protected]
+# DJ Lucas - [email protected]
#
# Version : LFS 7.7
#
@@ -18,6 +19,8 @@
up()
{
+ log_info_msg "Bringing up the ${1} interface..."
+
if ip link show $1 > /dev/null 2>&1; then
link_status=`ip link show $1`
@@ -28,9 +31,11 @@
fi
else
- log_failure_msg "\nInterface ${IFACE} doesn't exist."
+ log_failure_msg "Interface ${IFACE} doesn't exist."
exit 1
fi
+
+ evaluate_retval
}
RELEASE="7.7"
@@ -72,27 +77,29 @@
. /lib/lsb/init-functions
-log_info_msg "Bringing up the ${1} interface... "
-
if [ ! -r "${file}" ]; then
- log_failure_msg2 "${file} is missing or cannot be accessed."
+ log_failure_msg "Unable to bring up ${1} interface! ${file} is missing or
cannot be accessed."
exit 1
fi
-. $file
+. $file
if [ "$IFACE" = "" ]; then
- log_failure_msg2 "${file} does not define an interface [IFACE]."
+ log_failure_msg "Unable to bring up ${1} interface! ${file} does not define
an interface [IFACE]."
exit 1
fi
# Do not process this service if started by boot, and ONBOOT
# is not set to yes
if [ "${IN_BOOT}" = "1" -a "${ONBOOT}" != "yes" ]; then
- log_skip_msg
exit 0
fi
+# Bring up the interface
+if [ "$VIRTINT" != "yes" ]; then
+ up ${IFACE}
+fi
+
for S in ${SERVICE}; do
if [ ! -x "/lib/services/${S}" ]; then
MSG="\nUnable to process ${file}. Either "
@@ -110,8 +117,13 @@
IFCONFIG=${file} /lib/services/${S} ${IFACE} up
done
-# Bring up the interface and any components
-for I in $IFACE $INTERFACE_COMPONENTS; do up $I; done
+# Set link up virtual interfaces
+if [ "${VIRTINT}" == "yes" ]; then
+ up ${IFACE}
+fi
+
+# Bring up any additional interface components
+for I in $INTERFACE_COMPONENTS; do up $I; done
# Set MTU if requested. Check if MTU has a "good" value.
if test -n "${MTU}"; then
@@ -127,9 +139,9 @@
# Set the route default gateway if requested
if [ -n "${GATEWAY}" ]; then
if ip route | grep -q default; then
- log_skip_msg "\n Gateway already setup; skipping."
+ log_warning_msg "Gateway already setup; skipping."
else
- log_info_msg "Setting up default gateway..."
+ log_info_msg "Adding default gateway ${GATEWAY} to the ${IFACE}
interface..."
ip route add default via ${GATEWAY} dev ${IFACE}
evaluate_retval
fi
Modified: trunk/BOOK/bootscripts/lfs/sysconfig/rc.site
==============================================================================
--- trunk/BOOK/bootscripts/lfs/sysconfig/rc.site Wed May 22 15:00:40
2019 (r11609)
+++ trunk/BOOK/bootscripts/lfs/sysconfig/rc.site Fri May 24 12:06:18
2019 (r11610)
@@ -27,10 +27,10 @@
# Use a colored prefix
# These values, if specified here, override the defaults
-#BMPREFIX=" "
-#SUCCESS_PREFIX="${SUCCESS} * ${NORMAL}"
-#FAILURE_PREFIX="${FAILURE}*****${NORMAL}"
-#WARNING_PREFIX="${WARNING} *** ${NORMAL}"
+#BMPREFIX=" "
+#SUCCESS_PREFIX="${SUCCESS} * ${NORMAL} "
+#FAILURE_PREFIX="${FAILURE}*****${NORMAL} "
+#WARNING_PREFIX="${WARNING} *** ${NORMAL} "
# Manually seet the right edge of message output (characters)
# Useful when resetting console font during boot to override
Modified: trunk/BOOK/chapter01/changelog.xml
==============================================================================
--- trunk/BOOK/chapter01/changelog.xml Wed May 22 15:00:40 2019 (r11609)
+++ trunk/BOOK/chapter01/changelog.xml Fri May 24 12:06:18 2019 (r11610)
@@ -43,6 +43,15 @@
appropriate for the entry or if needed the entire day's listitem.
-->
+ <listitem revision="sysv">
+ <para>2019-05-24</para>
+ <itemizedlist>
+ <listitem>
+ <para>[dj] - Cosmetic changes to LFS bootscripts.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem>
<para>2019-05-19</para>
<itemizedlist>
Modified: trunk/BOOK/chapter01/whatsnew.xml
==============================================================================
--- trunk/BOOK/chapter01/whatsnew.xml Wed May 22 15:00:40 2019 (r11609)
+++ trunk/BOOK/chapter01/whatsnew.xml Fri May 24 12:06:18 2019 (r11610)
@@ -143,9 +143,9 @@
<!--<listitem>
<para>Less-&less-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
- </listitem>-->
+ </listitem>
<listitem>
<para>Libcap-&libcap-version;</para>
</listitem>
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Wed May 22 15:00:40 2019 (r11609)
+++ trunk/BOOK/general.ent Fri May 24 12:06:18 2019 (r11610)
@@ -1,4 +1,4 @@
-<!ENTITY version "SVN-20190519">
+<!ENTITY version "SVN-20190524">
<!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}]" -->
@@ -7,7 +7,7 @@
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "May 19, 2019">
+<!ENTITY releasedate "May 24, 2019">
<!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not
– -->
<!ENTITY milestone "8.5">
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Wed May 22 15:00:40 2019 (r11609)
+++ trunk/BOOK/packages.ent Fri May 24 12:06:18 2019 (r11610)
@@ -381,7 +381,7 @@
<!ENTITY less-ch6-du "3.9 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
-<!ENTITY lfs-bootscripts-version "20180820"> <!-- Scripts depend on this
format -->
+<!ENTITY lfs-bootscripts-version "20190524"> <!-- 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">
--
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
