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

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl 2023-10-05 00:30:10 +02:00
commit a494cc5e9c
5 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bootscripts/ChangeLog
View File

@ -1,3 +1,8 @@
2023-10-04 Pierre Labastie <pierre.labastie@neuf.fr>
* After the changes done on 2022-03-24, several "halt stop" should
have been changed to "halt start". Done now. Fortunately, those
occur only when something wrong happens with disks or devices.
2023-07-28 Xi Ruoyao <xry111@xry111.site> 2023-07-28 Xi Ruoyao <xry111@xry111.site>
* In mountvirtfs, mount /sys/fs/cgroup for udev from systemd-254. * In mountvirtfs, mount /sys/fs/cgroup for udev from systemd-254.
@ -24,7 +29,7 @@
* New semantics for K and S scripts: * New semantics for K and S scripts:
- S scripts only started if not already marked S in the previous runlevel - S scripts only started if not already marked S in the previous runlevel
- K scripts only started if not already marked K in the previous runlevel - K scripts only started if not already marked K in the previous runlevel
- remove the convention of running S scripts ith "stop" in rl 0/6 - remove the convention of running S scripts with "stop" in rl 0/6
2021-06-08 Bruce Dubbs <bdubbs@linuxfromscratch.org> 2021-06-08 Bruce Dubbs <bdubbs@linuxfromscratch.org>
* When shutting down the network, ignore invalid interfaces * When shutting down the network, ignore invalid interfaces
or interfaces that are not UP. or interfaces that are not UP.

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

@ -63,7 +63,7 @@ case "${1}" in
log_info_msg "Press Enter to continue..." log_info_msg "Press Enter to continue..."
wait_for_user wait_for_user
/etc/rc.d/init.d/halt stop /etc/rc.d/init.d/halt start
else else
log_success_msg2 log_success_msg2
fi fi
@ -127,7 +127,7 @@ case "${1}" in
log_info_msg "Press Enter to continue..." log_info_msg "Press Enter to continue..."
wait_for_user wait_for_user
/etc/rc.d/init.d/halt stop /etc/rc.d/init.d/halt start
fi fi
if [ "${error_value}" -ge 16 ]; then if [ "${error_value}" -ge 16 ]; then

2
bootscripts/lfs/init.d/udev
View File

@ -41,7 +41,7 @@ case "${1}" in
log_info_msg "$msg" log_info_msg "$msg"
log_info_msg "Press Enter to continue..." log_info_msg "Press Enter to continue..."
wait_for_user wait_for_user
/etc/rc.d/init.d/halt stop /etc/rc.d/init.d/halt start
fi fi
# Start the udev daemon to continually watch for, and act on, # Start the udev daemon to continually watch for, and act on,

10
chapter01/changelog.xml
View File

@ -40,6 +40,16 @@
appropriate for the entry or if needed the entire day's listitem. appropriate for the entry or if needed the entire day's listitem.
--> -->
<listitem>
<para>2023-10-03</para>
<itemizedlist>
<listitem>
<para>[xry111] - Update Glibc upstream fixes patch to fix
CVE-2023-4911.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2023-10-01</para> <para>2023-10-01</para>
<itemizedlist> <itemizedlist>

4
patches.ent
View File

@ -14,8 +14,8 @@
<!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2"> <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
<!ENTITY glibc-fhs-patch-size "2.8 KB"> <!ENTITY glibc-fhs-patch-size "2.8 KB">
<!ENTITY glibc-upstream-fixes-patch "glibc-&glibc-version;-upstream_fixes-2.patch"> <!ENTITY glibc-upstream-fixes-patch "glibc-&glibc-version;-upstream_fixes-3.patch">
<!ENTITY glibc-upstream-fixes-patch-md5 "a5a06adb7f61dcc901f35d810ac8a1c0"> <!ENTITY glibc-upstream-fixes-patch-md5 "545977e0b5c341ba945cf4b5de92f1e2">
<!ENTITY glibc-upstream-fixes-patch-size "28 KB"> <!ENTITY glibc-upstream-fixes-patch-size "28 KB">
<!ENTITY grub-upstream-fixes-patch "grub-&grub-version;-upstream_fixes-1.patch"> <!ENTITY grub-upstream-fixes-patch "grub-&grub-version;-upstream_fixes-1.patch">