aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Trepl <thomas@linuxfromscratch.org>2023-02-18 00:30:12 +0100
committerThomas Trepl <thomas@linuxfromscratch.org>2023-02-18 00:30:12 +0100
commitbef6431de36aae10be4de874f3db27ff4276226b (patch)
tree8e09910161f1e832168e035dee94e93f6b98b75a
parent3791d23718a30263d50354c952499ddaab5880ac (diff)
parentd94d6060488da23db738078541e4b08a743f763c (diff)
Automatic merge of trunk into multilib
-rw-r--r--chapter03/packages.xml14
-rw-r--r--chapter09/networkd.xml2
2 files changed, 15 insertions, 1 deletions
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 38c08e0f9..975383fd4 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -270,6 +270,20 @@
<para>Home page: <ulink url="&glibc-home;"/></para>
<para>Download: <ulink url="&glibc-url;"/></para>
<para>MD5 sum: <literal>&glibc-md5;</literal></para>
+
+ <note>
+ <para>
+ The Glibc developers maintain a
+ <ulink url='https://sourceware.org/git/?p=glibc.git;a=shortlog;h=refs/heads/release/&glibc-version;/master'>Git
+ branch</ulink> containing patches considered worthy for
+ Glibc-&glibc-version; but unfortunately developed after
+ Glibc-&glibc-version; release. The LFS editors will issue a
+ security advisory if any security fix is added into the branch,
+ but no actions will be taken for other newly added patches. You
+ may review the patches yourself and incorporate some patches if
+ you consider them important.
+ </para>
+ </note>
</listitem>
</varlistentry>
diff --git a/chapter09/networkd.xml b/chapter09/networkd.xml
index 56d41a983..43b7e7172 100644
--- a/chapter09/networkd.xml
+++ b/chapter09/networkd.xml
@@ -164,7 +164,7 @@ Name=&lt;network-device-name&gt;
[Network]
DHCP=ipv4
-[DHCP]
+[DHCPv4]
UseDomains=true</literal>
EOF</userinput></screen>