Changeset 530d929


Ignore:
Timestamp:
06/02/2019 11:21:32 AM (5 years ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib-10.1
Children:
d8a8713
Parents:
4a8482f
Message:

Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11611 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • bootscripts/lfs/lib/services/init-functions

    r4a8482f r530d929  
    4141
    4242# Use a colored prefix
    43 BMPREFIX="     "
    44 SUCCESS_PREFIX="${SUCCESS}  *  ${NORMAL}"
    45 FAILURE_PREFIX="${FAILURE}*****${NORMAL}"
    46 WARNING_PREFIX="${WARNING} *** ${NORMAL}"
    47 SKIP_PREFIX="${INFO}  S  ${NORMAL}"
     43BMPREFIX="      "
     44SUCCESS_PREFIX="${SUCCESS}  *  ${NORMAL} "
     45FAILURE_PREFIX="${FAILURE}*****${NORMAL} "
     46WARNING_PREFIX="${WARNING} *** ${NORMAL} "
     47SKIP_PREFIX="${INFO}  S   ${NORMAL}"
    4848
    4949SUCCESS_SUFFIX="${BRACKET}[${SUCCESS}  OK  ${BRACKET}]${NORMAL}"

  • bootscripts/lfs/lib/services/ipv4-static

    r4a8482f r530d929  
    4848   up)
    4949      if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP}/)" = "" ]; then
    50          
    51          # Cosmetic output
    52          if ! $(echo ${SERVICE} | grep -q " "); then
    53            log_info_msg2 "\n" # Terminate the previous message
    54          fi
    55          
    5650         log_info_msg "Adding IPv4 address ${IP} to the ${1} interface..."
    5751         ip addr add ${args} dev ${1}

  • bootscripts/lfs/sbin/ifup

    r4a8482f r530d929  
    88#               Kevin P. Fleming - kpfleming@linuxfromscratch.org
    99# Update      : Bruce Dubbs - bdubbs@linuxfromscratch.org
     10#               DJ Lucas - dj@linuxfromscratch.org
    1011#
    1112# Version     : LFS 7.7
    … …  
    1920up()
    2021{
     22  log_info_msg "Bringing up the ${1} interface..."
     23
    2124  if ip link show $1 > /dev/null 2>&1; then
    2225     link_status=`ip link show $1`
    … …  
    2932
    3033  else
    31      log_failure_msg "\nInterface ${IFACE} doesn't exist."
     34     log_failure_msg "Interface ${IFACE} doesn't exist."
    3235     exit 1
    3336  fi
     37
     38  evaluate_retval
    3439}
    3540
    … …  
    7378. /lib/lsb/init-functions
    7479
    75 log_info_msg "Bringing up the ${1} interface... "
    76 
    7780if [ ! -r "${file}" ]; then
    78    log_failure_msg2 "${file} is missing or cannot be accessed."
     81   log_failure_msg "Unable to bring up ${1} interface! ${file} is missing or cannot be accessed."
    7982   exit 1
    8083fi
    8184
    82 . $file
     85.  $file
    8386
    8487if [ "$IFACE" = "" ]; then
    85    log_failure_msg2 "${file} does not define an interface [IFACE]."
     88   log_failure_msg "Unable to bring up ${1} interface! ${file} does not define an interface [IFACE]."
    8689   exit 1
    8790fi
    … …  
    9093# is not set to yes
    9194if [ "${IN_BOOT}" = "1" -a "${ONBOOT}" != "yes" ]; then
    92    log_skip_msg
    9395   exit 0
     96fi
     97
     98# Bring up the interface
     99if [ "$VIRTINT" != "yes" ]; then
     100   up ${IFACE}
    94101fi
    95102
    … …  
    111118done
    112119
    113 # Bring up the interface and any components
    114 for I in $IFACE $INTERFACE_COMPONENTS; do up $I; done
     120# Set link up virtual interfaces
     121if [ "${VIRTINT}" == "yes" ]; then
     122   up ${IFACE}
     123fi
     124
     125# Bring up any additional interface components
     126for I in $INTERFACE_COMPONENTS; do up $I; done
    115127
    116128# Set MTU if requested. Check if MTU has a "good" value.
    … …  
    128140if [ -n "${GATEWAY}" ]; then
    129141   if ip route | grep -q default; then
    130       log_skip_msg "\n     Gateway already setup; skipping."
     142      log_warning_msg "Gateway already setup; skipping."
    131143   else
    132       log_info_msg "Setting up default gateway..."
     144      log_info_msg "Adding default gateway ${GATEWAY} to the ${IFACE} interface..."
    133145      ip route add default via ${GATEWAY} dev ${IFACE}
    134146      evaluate_retval

  • bootscripts/lfs/sysconfig/rc.site

    r4a8482f r530d929  
    2828# Use a colored prefix
    2929# These values, if specified here, override the defaults
    30 #BMPREFIX="     "
    31 #SUCCESS_PREFIX="${SUCCESS}  *  ${NORMAL}"
    32 #FAILURE_PREFIX="${FAILURE}*****${NORMAL}"
    33 #WARNING_PREFIX="${WARNING} *** ${NORMAL}"
     30#BMPREFIX="      "
     31#SUCCESS_PREFIX="${SUCCESS}  *  ${NORMAL} "
     32#FAILURE_PREFIX="${FAILURE}*****${NORMAL} "
     33#WARNING_PREFIX="${WARNING} *** ${NORMAL} "
    3434
    3535# Manually seet the right edge of message output (characters)

  • chapter01/changelog.xml

    r4a8482f r530d929  
    4646    -->
    4747
     48    <listitem revision="sysv">
     49      <para>2019-05-24</para>
     50      <itemizedlist>
     51        <listitem>
     52          <para>[dj] - Cosmetic changes to LFS bootscripts.</para>
     53        </listitem>
     54      </itemizedlist>
     55    </listitem>
     56
    4857    <listitem>
    4958      <para>2019-05-19</para>

  • chapter01/whatsnew.xml

    r4a8482f r530d929  
    144144      <para>Less-&less-version;</para>
    145145   </listitem>-->
    146     <!--<listitem>
     146    <listitem>
    147147      <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
    148     </listitem>-->
     148    </listitem>
    149149    <listitem>
    150150      <para>Libcap-&libcap-version;</para>

  • general.ent

    r4a8482f r530d929  
    1 <!ENTITY version         "SVN-20190519">
     1<!ENTITY version         "SVN-20190524">
    22<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
    33                                      Change to x.y for release but not -rc releases -->
    … …  
    88<!ENTITY generic-versiond "systemd">
    99
    10 <!ENTITY releasedate     "May 19, 2019">
     10<!ENTITY releasedate     "May 24, 2019">
    1111
    1212<!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->

  • packages.ent

    r4a8482f r530d929  
    390390<!ENTITY less-ch6-sbu "less than 0.1 SBU">
    391391
    392 <!ENTITY lfs-bootscripts-version "20180820">      <!-- Scripts depend on this format -->
     392<!ENTITY lfs-bootscripts-version "20190524">      <!-- Scripts depend on this format -->
    393393<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">       
    394394<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
    … …  
    538538<!ENTITY openssl-version "1.1.1b">
    539539<!ENTITY openssl-size "8,022 KB">
    540 <!ENTITY openssl-url "https://openssl.org/source/openssl-&openssl-version;.tar.gz">
     540<!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
    541541<!ENTITY openssl-md5 "4532712e7bcc9414f5bce995e4e13930">
    542542<!ENTITY openssl-home "https://www.openssl.org/">
Note: See TracChangeset for help on using the changeset viewer.