gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-18 19:29:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update formats of error messages in checkfs boot script.

Browse Source 
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
This commit is contained in:
Bruce Dubbs 2017-03-18 22:47:45 +00:00
parent 8caabdd31b
commit d83fd51aa6
7 changed files with 58 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bootscripts/lfs/init.d/checkfs
View File

@ -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

27
chapter01/changelog.xml
View File

@ -42,6 +42,33 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<para>2017-03-18</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update formats of error messages in checkfs
boot script. Fixes
<ulink url="&lfs-ticket-root;4064">#4064</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to man-pages-4.10. Fixes
<ulink url="&lfs-ticket-root;4063">#4063</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-4.10.3. Fixes
<ulink url="&lfs-ticket-root;4062">#4062</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to gdbm-1.13. Fixes
<ulink url="&lfs-ticket-root;4061">#4061</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to coreutils-8.27. Fixes
<ulink url="&lfs-ticket-root;4060">#4060</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2017-03-11</para>
<itemizedlist>

12
chapter01/whatsnew.xml
View File

@ -53,9 +53,9 @@
<!--<listitem>
<para>Check &check-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Coreutils &coreutils-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>DejaGNU &dejagnu-version;</para>
</listitem>-->
@ -92,9 +92,9 @@
<!--<listitem>
<para>GCC &gcc-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>GDBM &gdbm-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Gettext &gettext-version;</para>
</listitem>-->
@ -164,9 +164,9 @@
<!--<listitem>
<para>Man-DB &man-db-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Man-pages &man-pages-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>MPC &mpc-version;</para>
</listitem>-->

5
chapter06/coreutils.xml
View File

@ -119,8 +119,9 @@
<screen><userinput remap="test">su nobody -s /bin/bash \
-c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
<para>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.</para>
<para>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.</para>
<para>Remove the temporary group:</para>

6
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20170311">
<!ENTITY version "SVN-20170318">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
<!ENTITY versiond "20170311-systemd">
<!ENTITY versiond "20170318-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
<!ENTITY releasedate "March 11, 2017">
<!ENTITY releasedate "March 18, 2017">
<!ENTITY copyrightdate "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.1">

24
packages.ent
View File

@ -98,10 +98,10 @@
<!ENTITY check-ch5-du "11 MB">
<!ENTITY check-ch5-sbu "0.1 SBU">
<!ENTITY coreutils-version "8.26">
<!ENTITY coreutils-size "5,676 KB">
<!ENTITY coreutils-version "8.27">
<!ENTITY coreutils-size "5,162 KB">
<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
<!ENTITY coreutils-md5 "d5aa2072f662d4118b9f4c63b94601a6">
<!ENTITY coreutils-md5 "502795792c212932365e077946d353ae">
<!ENTITY coreutils-home "&gnu-software;coreutils/">
<!ENTITY coreutils-ch5-du "136 MB">
<!ENTITY coreutils-ch5-sbu "0.6 SBU">
@ -222,10 +222,10 @@
<!ENTITY libstdcpp-ch5-du "898 MB">
<!ENTITY libstdcpp-ch5-sbu "0.4 SBU">
<!ENTITY gdbm-version "1.12">
<!ENTITY gdbm-size "822 KB">
<!ENTITY gdbm-version "1.13">
<!ENTITY gdbm-size "872 KB">
<!ENTITY gdbm-url "&gnu;gdbm/gdbm-&gdbm-version;.tar.gz">
<!ENTITY gdbm-md5 "9ce96ff4c99e74295ea19040931c8fb9">
<!ENTITY gdbm-md5 "8929dcda2a8de3fd2367bdbf66769376">
<!ENTITY gdbm-home "&gnu-software;gdbm/">
<!ENTITY gdbm-ch6-du "9 MB">
<!ENTITY gdbm-ch6-sbu "0.1 SBU">
@ -358,7 +358,7 @@
<!ENTITY less-ch6-du "3.5 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
<!ENTITY lfs-bootscripts-version "20150222"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-version "20170318"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">
@ -392,12 +392,12 @@
<!ENTITY linux-major-version "4">
<!ENTITY linux-minor-version "10">
<!ENTITY linux-patch-version "1">
<!ENTITY linux-patch-version "3">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "92,013 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "ed01fa8c30342def9712769762ca55ea">
<!ENTITY linux-md5 "626292ab8b495e81efe6ee45baf6b817">
<!ENTITY linux-home "http://www.kernel.org/">
<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine,
@ -438,10 +438,10 @@
<!ENTITY man-db-ch6-du "30 MB">
<!ENTITY man-db-ch6-sbu "0.4 SBU">
<!ENTITY man-pages-version "4.09">
<!ENTITY man-pages-size "1,486 KB">
<!ENTITY man-pages-version "4.10">
<!ENTITY man-pages-size "1,521 KB">
<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
<!ENTITY man-pages-md5 "91c721409bbf823d8f62bee3a1fe8ae3">
<!ENTITY man-pages-md5 "c76a2844ea70e374fdff9c2e61bbe85b">
<!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
<!ENTITY man-pages-ch6-du "27 MB">
<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">

2
patches.ent
View File

@ -15,7 +15,7 @@
<!ENTITY bzip2-docs-patch-size "1.6 KB">
<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
<!ENTITY coreutils-i18n-patch-md5 "e1f87b10b23d66344e5e99e7fabfa7a2">
<!ENTITY coreutils-i18n-patch-md5 "a9404fb575dfd5514f3c8f4120f9ca7d">
<!ENTITY coreutils-i18n-patch-size "168 KB">
<!--