Ignore:
Timestamp:
03/25/2009 06:35:58 AM (16 years ago)
Author:
DJ Lucas <dj@…>
Branches:
10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 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, 12.2, 12.2-rc1, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, 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/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
c990c5c
Parents:
9da9f24f
Message:

Corrected several 'echo -e' lines in cleanfs and checkfs.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8849 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:
bootscripts/contrib/lsb-v3/init.d
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • bootscripts/contrib/lsb-v3/init.d/checkfs

    r9da9f24f r6f69b5c  
    3131        then
    3232            log_failure_msg "Mounting root file system in read-only mode"
    33             echo "${FAILURE}FAILURE:\n"
    34             echo -n "${FIALURE}Cannot check root filesystem because it "
    35             echo "${FAILURE}could not be mounted"
    36             echo "${FAILURE}in read-only mode.\n\n"
    37             echo -n "${FAILURE}After you press Enter, this system will be "
    38             echo "${FAILURE}halted and powered off.\n"
    39             echo "${INFO}Press enter to continue...${NORMAL}"
     33            echo -e "${FAILURE}FAILURE:\n"
     34            echo -e -n "${FIALURE}Cannot check root filesystem because it "
     35            echo -e "${FAILURE}could not be mounted"
     36            echo -e "${FAILURE}in read-only mode.\n\n"
     37            echo -e -n "${FAILURE}After you press Enter, this system will be "
     38            echo -e "${FAILURE}halted and powered off.\n"
     39            echo -e "${INFO}Press enter to continue...${NORMAL}"
    4040            read ENTER
    4141            /etc/rc.d/init.d/halt stop
     
    6262        then
    6363            log_warning_msg "Checking file systems..."
    64             echo "${WARNING}WARNING:\n"
    65             echo "${WARNING}File system errors were found and have been"
    66             echo "${WARNING}corrected.  You may want to double-check that"
    67             echo "${WARNING}everything was fixed properly.${NORMAL}"
     64            echo -e "${WARNING}WARNING:\n"
     65            echo -e "${WARNING}File system errors were found and have been"
     66            echo -e "${WARNING}corrected.  You may want to double-check that"
     67            echo -e "${WARNING}everything was fixed properly.${NORMAL}"
    6868        elif [ "${error_value}" = 2 -o "${error_value}" = 3 ]; then
    6969            log_warning_msg "Checking file systems..."
    70             echo "${WARNING}WARNING:\n"
    71             echo "${WARNING}File system errors were found and have been been"
    72             echo "${WARNING}corrected, but the nature of the errors require"
    73             echo "${WARNING}this system to be rebooted.\n"
    74             echo "After you press enter, this system will be rebooted.\n"
    75             echo "${INFO}Press Enter to continue...${NORMAL}"
     70            echo -e "${WARNING}WARNING:\n"
     71            echo -e "${WARNING}File system errors were found and have been been"
     72            echo -e "${WARNING}corrected, but the nature of the errors require"
     73            echo -e "${WARNING}this system to be rebooted.\n"
     74            echo -e "After you press enter, this system will be rebooted.\n"
     75            echo -e "${INFO}Press Enter to continue...${NORMAL}"
    7676            read ENTER
    7777            reboot -f
    7878        elif [ "${error_value}" -gt 3 -a "${error_value}" -lt 16 ]; then
    7979            log_failure_msg "Checking file systems..."
    80             echo "${FAILURE}FAILURE:\n"
    81             echo "${FAILURE}File system errors were encountered that could"
    82             echo "${FAILURE}not be fixed automatically.  This system cannot"
    83             echo "${FAILURE}continue to boot and will therefore be halted"
    84             echo "${FAILURE}until those errors are fixed manually by a"
    85             echo "${FAILURE}System Administrator.\n"
    86             echo "${FAILURE}After you press Enter, this system will be"
    87             echo "${FAILURE}halted and powered off.\n"
    88             echo "${INFO}Press Enter to continue...${NORMAL}"
     80            echo -e "${FAILURE}FAILURE:\n"
     81            echo -e "${FAILURE}File system errors were encountered that could"
     82            echo -e "${FAILURE}not be fixed automatically.  This system cannot"
     83            echo -e "${FAILURE}continue to boot and will therefore be halted"
     84            echo -e "${FAILURE}until those errors are fixed manually by a"
     85            echo -e "${FAILURE}System Administrator.\n"
     86            echo -e "${FAILURE}After you press Enter, this system will be"
     87            echo -e "${FAILURE}halted and powered off.\n"
     88            echo -e "${INFO}Press Enter to continue...${NORMAL}"
    8989            read ENTER
    9090            /etc/rc.d/init.d/halt stop
    9191        elif [ "${error_value}" -ge 16 ]; then
    9292            log_failure_msg "Checking file systems..."
    93             echo "${FAILURE}FAILURE:\n"
    94             echo "${FAILURE}Unexpected Failure running fsck.  Exited with error"
    95             echo "${FAILURE}code: ${error_value}.${NORMAL}"
     93            echo -e "${FAILURE}FAILURE:\n"
     94            echo -e "${FAILURE}Unexpected Failure running fsck.  Exited with error"
     95            echo -e "${FAILURE}code: ${error_value}.${NORMAL}"
    9696            exit ${error_value}
    9797        fi
  • bootscripts/contrib/lsb-v3/init.d/cleanfs

    r9da9f24f r6f69b5c  
    5656                            ;;
    5757                        *)
    58                             echo -n "\n${WARNING}Unknown device type: ${dtype}"
    59                             echo "${NORMAL}"
     58                            echo -e -n "\n${WARNING}Unknown device type: ${dtype}"
     59                            echo -e "${NORMAL}"
    6060                            ;;
    6161                    esac
    6262                    ;;
    6363                *)
    64                     echo "\n${WARNING}Unknown type: ${type}${NORMAL}"
     64                    echo -e "\n${WARNING}Unknown type: ${type}${NORMAL}"
    6565                    continue
    6666                    ;;
     
    112112
    113113# End /etc/init.d/cleanfs
     114
  • bootscripts/contrib/lsb-v3/init.d/rc

    r9da9f24f r6f69b5c  
    128128# Start all functions in this runlevel if they weren't started in
    129129# the previous runlevel
    130 for link in $( ls -v ${RC_BASE}/rc${runlevel}.d/S* 2> /dev/null)
     130for link in $(ls -v ${RC_BASE}/rc${runlevel}.d/S* 2> /dev/null)
    131131do
    132132    if [ "${prevlevel}" != "N" ]; then
Note: See TracChangeset for help on using the changeset viewer.