From 948cd148be899247236e1ab8e5a9be8e0be97e29 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 25 Aug 2024 15:32:24 +0800 Subject: [PATCH] Update to lfs-bootscripts-20240825 Co-authored-by: Andrew Kreimer --- bootscripts/ChangeLog | 7 +++++++ bootscripts/lfs/lib/services/init-functions | 3 --- bootscripts/lfs/sbin/ifup.8 | 8 ++++---- chapter01/changelog.xml | 10 ++++++++++ packages.ent | 2 +- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index d3a7ed661..41576792f 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,10 @@ +2024-08-25 Xi Ruoyao + * Remove an empty line and an outdated comment (not valid anymore after + /usr merge) from init-functions. + +2024-08-24 Andrew Kreimer + * Fix typos. + 2024-08-23 Xi Ruoyao * In console, detect FB console by checking /sys/class/graphics/fbcon instead of fb0. The latter does not exist if CONFIG_FB=n, but diff --git a/bootscripts/lfs/lib/services/init-functions b/bootscripts/lfs/lib/services/init-functions index 2bcadaa30..e13bb8a5d 100644 --- a/bootscripts/lfs/lib/services/init-functions +++ b/bootscripts/lfs/lib/services/init-functions @@ -457,11 +457,8 @@ pidofproc() # If a PID file is set and exists, use it. if [ -n "${pidfile}" -a -e "${pidfile}" ]; then - # Use the value in the first line of the pidfile pidlist=`/bin/head -n1 "${pidfile}"` - # This can optionally be written as 'sed 1q' to repalce 'head -n1' - # should LFS move /bin/head to /usr/bin/head else # Use pidof pidlist=`pidof "${program}"` diff --git a/bootscripts/lfs/sbin/ifup.8 b/bootscripts/lfs/sbin/ifup.8 index 2fb7873ec..8d08d8c14 100644 --- a/bootscripts/lfs/sbin/ifup.8 +++ b/bootscripts/lfs/sbin/ifup.8 @@ -94,7 +94,7 @@ NOTES compound device such as a bridge. ONBOOT - If set to 'yes', the specified interface is - configured by the netowrk boot script. + configured by the network boot script. GATEWAY - The default IP address to use for routing if the destination IP address is not in a static @@ -112,7 +112,7 @@ NOTES This list is normally a single value, e.g. eth0, for use with a virtual host such as kvm. - Other paramters that are service specific include: + Other parameters that are service specific include: ipv4-static @@ -128,7 +128,7 @@ NOTES additional IP addresses to a network device. Example: eth0:2 (optional) - BROADCAST - The brodcast address for this interface, + BROADCAST - The broadcast address for this interface, e.g 192.168.1.255. If not specified, the broadcast address will be calculated from the IP and PREFIX. @@ -154,7 +154,7 @@ NOTES DHCP_START - Optional parameters to pass to the dhcp client at startup. - DHCP_STOP - Optional paremeters to pass to the dhcp client + DHCP_STOP - Optional parameters to pass to the dhcp client at shutdown. PRINTIP - Flag to print the dhcp address to stdout diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 7f58d2d3b..d0cf45003 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,16 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-08-23 + + + [xry111] - Update to lfs-bootscripts-20240825. Only trivial + non-functional changes. + + + + 2024-08-23 diff --git a/packages.ent b/packages.ent index e21d6b718..e8108cfbd 100644 --- a/packages.ent +++ b/packages.ent @@ -381,7 +381,7 @@ - +