gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-06 14:24:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8849 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
DJ Lucas 2009-03-25 06:35:58 +00:00
parent 9da9f24fff
commit 6f69b5c249
4 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bootscripts/contrib/lsb-v3/ChangeLog
View File

@ -1,4 +1,7 @@
ChangeLog ChangeLog
20090325 - [dj] * Corrected serveral echo commands missing -e - Thanks to
Michael Tremer at IPFire for the corrections.
20081023 - [dj] * Removed BROKEN_COMPOSE handling in console script because 20081023 - [dj] * Removed BROKEN_COMPOSE handling in console script because
kernel patch was accepted upstream. kernel patch was accepted upstream.

58
bootscripts/contrib/lsb-v3/init.d/checkfs
View File

@ -30,13 +30,13 @@ case "${1}" in
if [ ${?} != 0 ] if [ ${?} != 0 ]
then then
log_failure_msg "Mounting root file system in read-only mode" log_failure_msg "Mounting root file system in read-only mode"
echo "${FAILURE}FAILURE:\n" echo -e "${FAILURE}FAILURE:\n"
echo -n "${FIALURE}Cannot check root filesystem because it " echo -e -n "${FIALURE}Cannot check root filesystem because it "
echo "${FAILURE}could not be mounted" echo -e "${FAILURE}could not be mounted"
echo "${FAILURE}in read-only mode.\n\n" echo -e "${FAILURE}in read-only mode.\n\n"
echo -n "${FAILURE}After you press Enter, this system will be " echo -e -n "${FAILURE}After you press Enter, this system will be "
echo "${FAILURE}halted and powered off.\n" echo -e "${FAILURE}halted and powered off.\n"
echo "${INFO}Press enter to continue...${NORMAL}" echo -e "${INFO}Press enter to continue...${NORMAL}"
read ENTER read ENTER
/etc/rc.d/init.d/halt stop /etc/rc.d/init.d/halt stop
fi fi
@ -61,38 +61,38 @@ case "${1}" in
elif [ "${error_value}" = 1 ] elif [ "${error_value}" = 1 ]
then then
log_warning_msg "Checking file systems..." log_warning_msg "Checking file systems..."
echo "${WARNING}WARNING:\n" echo -e "${WARNING}WARNING:\n"
echo "${WARNING}File system errors were found and have been" echo -e "${WARNING}File system errors were found and have been"
echo "${WARNING}corrected. You may want to double-check that" echo -e "${WARNING}corrected. You may want to double-check that"
echo "${WARNING}everything was fixed properly.${NORMAL}" echo -e "${WARNING}everything was fixed properly.${NORMAL}"
elif [ "${error_value}" = 2 -o "${error_value}" = 3 ]; then elif [ "${error_value}" = 2 -o "${error_value}" = 3 ]; then
log_warning_msg "Checking file systems..." log_warning_msg "Checking file systems..."
echo "${WARNING}WARNING:\n" echo -e "${WARNING}WARNING:\n"
echo "${WARNING}File system errors were found and have been been" echo -e "${WARNING}File system errors were found and have been been"
echo "${WARNING}corrected, but the nature of the errors require" echo -e "${WARNING}corrected, but the nature of the errors require"
echo "${WARNING}this system to be rebooted.\n" echo -e "${WARNING}this system to be rebooted.\n"
echo "After you press enter, this system will be rebooted.\n" echo -e "After you press enter, this system will be rebooted.\n"
echo "${INFO}Press Enter to continue...${NORMAL}" echo -e "${INFO}Press Enter to continue...${NORMAL}"
read ENTER read ENTER
reboot -f reboot -f
elif [ "${error_value}" -gt 3 -a "${error_value}" -lt 16 ]; then elif [ "${error_value}" -gt 3 -a "${error_value}" -lt 16 ]; then
log_failure_msg "Checking file systems..." log_failure_msg "Checking file systems..."
echo "${FAILURE}FAILURE:\n" echo -e "${FAILURE}FAILURE:\n"
echo "${FAILURE}File system errors were encountered that could" echo -e "${FAILURE}File system errors were encountered that could"
echo "${FAILURE}not be fixed automatically. This system cannot" echo -e "${FAILURE}not be fixed automatically. This system cannot"
echo "${FAILURE}continue to boot and will therefore be halted" echo -e "${FAILURE}continue to boot and will therefore be halted"
echo "${FAILURE}until those errors are fixed manually by a" echo -e "${FAILURE}until those errors are fixed manually by a"
echo "${FAILURE}System Administrator.\n" echo -e "${FAILURE}System Administrator.\n"
echo "${FAILURE}After you press Enter, this system will be" echo -e "${FAILURE}After you press Enter, this system will be"
echo "${FAILURE}halted and powered off.\n" echo -e "${FAILURE}halted and powered off.\n"
echo "${INFO}Press Enter to continue...${NORMAL}" echo -e "${INFO}Press Enter to continue...${NORMAL}"
read ENTER read ENTER
/etc/rc.d/init.d/halt stop /etc/rc.d/init.d/halt stop
elif [ "${error_value}" -ge 16 ]; then elif [ "${error_value}" -ge 16 ]; then
log_failure_msg "Checking file systems..." log_failure_msg "Checking file systems..."
echo "${FAILURE}FAILURE:\n" echo -e "${FAILURE}FAILURE:\n"
echo "${FAILURE}Unexpected Failure running fsck. Exited with error" echo -e "${FAILURE}Unexpected Failure running fsck. Exited with error"
echo "${FAILURE}code: ${error_value}.${NORMAL}" echo -e "${FAILURE}code: ${error_value}.${NORMAL}"
exit ${error_value} exit ${error_value}
fi fi
;; ;;

7
bootscripts/contrib/lsb-v3/init.d/cleanfs
View File

@ -55,13 +55,13 @@ create_files()
mknod "${name}" p mknod "${name}" p
;; ;;
*) *)
echo -n "\n${WARNING}Unknown device type: ${dtype}" echo -e -n "\n${WARNING}Unknown device type: ${dtype}"
echo "${NORMAL}" echo -e "${NORMAL}"
;; ;;
esac esac
;; ;;
*) *)
echo "\n${WARNING}Unknown type: ${type}${NORMAL}" echo -e "\n${WARNING}Unknown type: ${type}${NORMAL}"
continue continue
;; ;;
esac esac
@ -111,3 +111,4 @@ case "${1}" in
esac esac
# End /etc/init.d/cleanfs # End /etc/init.d/cleanfs

2
bootscripts/contrib/lsb-v3/init.d/rc
View File

@ -127,7 +127,7 @@ fi
# Start all functions in this runlevel if they weren't started in # Start all functions in this runlevel if they weren't started in
# the previous runlevel # the previous runlevel
for link in $( ls -v ${RC_BASE}/rc${runlevel}.d/S* 2> /dev/null) for link in $(ls -v ${RC_BASE}/rc${runlevel}.d/S* 2> /dev/null)
do do
if [ "${prevlevel}" != "N" ]; then if [ "${prevlevel}" != "N" ]; then
script=${link#$RC_BASE/rc$runlevel.d/S[0-9][0-9]} script=${link#$RC_BASE/rc$runlevel.d/S[0-9][0-9]}