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/checkfs

    rdf1207e rd4c8dce4  
    6262         log_failure_msg "${msg}"
    6363
    64          log_info_msg "Press Enter to continue..." 
     64         log_info_msg "Press Enter to continue..."
    6565         wait_for_user
    6666         /etc/rc.d/init.d/halt stop
     
    7070
    7171      if [ -f /forcefsck ]; then
    72          msg="/forcefsck found, forcing file" 
     72         msg="/forcefsck found, forcing file"
    7373         msg="${msg} system checks as requested."
    7474         log_success_msg "$msg"
     
    109109         log_failure_msg "$msg"
    110110
    111          log_info_msg "Press Enter to continue..." 
     111         log_info_msg "Press Enter to continue..."
    112112         wait_for_user
    113113         reboot -f
     
    126126         log_failure_msg "$msg"
    127127
    128          log_info_msg "Press Enter to continue..." 
     128         log_info_msg "Press Enter to continue..."
    129129         wait_for_user
    130130         /etc/rc.d/init.d/halt stop
Note: See TracChangeset for help on using the changeset viewer.