aboutsummaryrefslogtreecommitdiffstats
path: root/bootscripts
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2017-03-18 22:47:45 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2017-03-18 22:47:45 +0000
commitd83fd51aa6f128ff50898081761940f6c42136b9 (patch)
tree7759eaba6445748801f4690589d5bdd181df5684 /bootscripts
parent8caabdd31b498d798d185434d6fb6e21f66dd8a6 (diff)
Update formats of error messages in checkfs boot script.
Update to man-pages-4.10. Update to linux-4.10.3. Update to gdbm-1.13. Update to coreutils-8.27. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11209 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'bootscripts')
-rw-r--r--bootscripts/lfs/init.d/checkfs12
1 files changed, 6 insertions, 6 deletions
diff --git a/bootscripts/lfs/init.d/checkfs b/bootscripts/lfs/init.d/checkfs
index c711e4a9f..2ab1bf119 100644
--- a/bootscripts/lfs/init.d/checkfs
+++ b/bootscripts/lfs/init.d/checkfs
@@ -69,7 +69,7 @@ case "${1}" in
fi
if [ -f /forcefsck ]; then
- msg="\n/forcefsck found, forcing file"
+ msg="/forcefsck found, forcing file"
msg="${msg} system checks as requested."
log_success_msg "$msg"
options="-f"
@@ -94,7 +94,7 @@ case "${1}" in
if [ "${error_value}" = 1 ]; then
msg="\nWARNING:\n\nFile system errors "
msg="${msg}were found and have been corrected.\n"
- msg="${msg}You may want to double-check that "
+ msg="${msg} You may want to double-check that "
msg="${msg}everything was fixed properly."
log_warning_msg "$msg"
fi
@@ -116,7 +116,7 @@ case "${1}" in
if [ "${error_value}" -gt 3 -a "${error_value}" -lt 16 ]; then
msg="\nFAILURE:\n\nFile system errors "
msg="${msg}were encountered that could not be "
- msg="${msg}fixed automatically. This system "
+ msg="${msg}fixed automatically.\nThis system "
msg="${msg}cannot continue to boot and will "
msg="${msg}therefore be halted until those "
msg="${msg}errors are fixed manually by a "
@@ -131,10 +131,10 @@ case "${1}" in
fi
if [ "${error_value}" -ge 16 ]; then
- msg="\nFAILURE:\n\nUnexpected Failure "
+ msg="FAILURE:\n\nUnexpected failure "
msg="${msg}running fsck. Exited with error "
- msg="${msg} code: ${error_value}."
- log_failure_msg $msg
+ msg="${msg} code: ${error_value}.\n"
+ log_info_msg $msg
exit ${error_value}
fi