mirror of
https://git.linuxfromscratch.org/lfs.git
synced 2025-03-06 06:14:47 +00:00
Merge changes from trunk
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11611 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl
Xℹ Ruoyao
parent
8a67f19184
commit
e9d172b212
@ -41,9 +41,9 @@ BRACKET="\\033[1;34m" # Brackets are blue
|
||||
|
||||
# Use a colored prefix
|
||||
BMPREFIX=" "
|
||||
SUCCESS_PREFIX="${SUCCESS} * ${NORMAL}"
|
||||
FAILURE_PREFIX="${FAILURE}*****${NORMAL}"
|
||||
WARNING_PREFIX="${WARNING} *** ${NORMAL}"
|
||||
SUCCESS_PREFIX="${SUCCESS} * ${NORMAL} "
|
||||
FAILURE_PREFIX="${FAILURE}*****${NORMAL} "
|
||||
WARNING_PREFIX="${WARNING} *** ${NORMAL} "
|
||||
SKIP_PREFIX="${INFO} S ${NORMAL}"
|
||||
|
||||
SUCCESS_SUFFIX="${BRACKET}[${SUCCESS} OK ${BRACKET}]${NORMAL}"
|
||||
|
||||
@ -47,12 +47,6 @@ fi
|
||||
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
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
# Authors : Nathan Coulson - nathan@linuxfromscratch.org
|
||||
# Kevin P. Fleming - kpfleming@linuxfromscratch.org
|
||||
# Update : Bruce Dubbs - bdubbs@linuxfromscratch.org
|
||||
# DJ Lucas - dj@linuxfromscratch.org
|
||||
#
|
||||
# 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 @@ up()
|
||||
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 @@ file=/etc/sysconfig/ifconfig.${1}
|
||||
|
||||
. /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
|
||||
|
||||
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 @@ for S in ${SERVICE}; do
|
||||
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 @@ fi
|
||||
# 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
|
||||
|
||||
@ -28,9 +28,9 @@
|
||||
# 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}"
|
||||
#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
|
||||
|
||||
@ -45,6 +45,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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -389,7 +389,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">
|
||||
@ -537,7 +537,7 @@
|
||||
|
||||
<!ENTITY openssl-version "1.1.1b">
|
||||
<!ENTITY openssl-size "8,022 KB">
|
||||
<!ENTITY openssl-url "https://openssl.org/source/openssl-&openssl-version;.tar.gz">
|
||||
<!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
|
||||
<!ENTITY openssl-md5 "4532712e7bcc9414f5bce995e4e13930">
|
||||
<!ENTITY openssl-home "https://www.openssl.org/">
|
||||
<!ENTITY openssl-ch6-du "141 MB">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user