From d83fd51aa6f128ff50898081761940f6c42136b9 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sat, 18 Mar 2017 22:47:45 +0000 Subject: [PATCH] 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 --- bootscripts/lfs/init.d/checkfs | 12 ++++++------ chapter01/changelog.xml | 27 +++++++++++++++++++++++++++ chapter01/whatsnew.xml | 12 ++++++------ chapter06/coreutils.xml | 5 +++-- general.ent | 6 +++--- packages.ent | 24 ++++++++++++------------ patches.ent | 2 +- 7 files changed, 58 insertions(+), 30 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 diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 3a08694e6..91ef6971f 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -42,6 +42,33 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2017-03-18 + + + [bdubbs] - Update formats of error messages in checkfs + boot script. Fixes + #4064. + + + [bdubbs] - Update to man-pages-4.10. Fixes + #4063. + + + [bdubbs] - Update to linux-4.10.3. Fixes + #4062. + + + [bdubbs] - Update to gdbm-1.13. Fixes + #4061. + + + [bdubbs] - Update to coreutils-8.27. Fixes + #4060. + + + + 2017-03-11 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 6cbf66710..5231d4e9a 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -53,9 +53,9 @@ - + @@ -92,9 +92,9 @@ - + @@ -164,9 +164,9 @@ - + diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 026e806e2..8b66d43c8 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -119,8 +119,9 @@ su nobody -s /bin/bash \ -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check" - The test-getlogin test is known to fail on a virtual console such as - the chroot environment here, but passes if run in an X terminal. + The test programs test-getlogin and date-debug are known to fail in a + partially built system environment like the chroot environment here, but + pass if run at the end of this chapter. Remove the temporary group: diff --git a/general.ent b/general.ent index c6a809503..2581c86be 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/packages.ent b/packages.ent index abc5cddfb..aae3c2665 100644 --- a/packages.ent +++ b/packages.ent @@ -98,10 +98,10 @@ - - + + - + @@ -222,10 +222,10 @@ - - + + - + @@ -358,7 +358,7 @@ - + @@ -392,12 +392,12 @@ - + - +