Ignore:
Timestamp:
09/15/2021 07:24:40 AM (3 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
9af096e
Parents:
df1207e (diff), 06e7b361 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into plabs/condxml

File:
1 edited

Legend:

Unmodified
Added
Removed
  • bootscripts/lfs/init.d/modules

    rdf1207e rd4c8dce4  
    3838      egrep -qv '^($|#)' /etc/sysconfig/modules || exit 0
    3939
    40       log_info_msg "Loading modules:" 
     40      log_info_msg "Loading modules:"
    4141
    4242      # Only try to load modules if the user has actually given us
     
    5555         # Print the module name if successful, otherwise take note.
    5656         if [ $? -eq 0 ]; then
    57             log_info_msg2 " ${module}" 
     57            log_info_msg2 " ${module}"
    5858         else
    5959            failedmod="${failedmod} ${module}"
     
    6464      log_success_msg2
    6565
    66       # Print a failure message with a list of any modules that 
     66      # Print a failure message with a list of any modules that
    6767      # may have failed to load.
    6868      if [ -n "${failedmod}" ]; then
    69          log_failure_msg "Failed to load modules:${failedmod}" 
     69         log_failure_msg "Failed to load modules:${failedmod}"
    7070         exit 1
    7171      fi
Note: See TracChangeset for help on using the changeset viewer.