From 872a378f5e0b75229d2adffad621dcf95cbe5ab4 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 23 Aug 2024 13:59:56 -0500 Subject: [PATCH 1/4] Typos on comments. These changes are all in comments that do not affect the books in any way. --- aux-file-data.sh | 2 +- git-version.sh | 2 +- lfs-latest-git.php | 2 +- packages.ent | 2 +- stylesheets/lfs-xsl/chunkfast.xsl | 2 +- stylesheets/lfs-xsl/common.xsl | 4 ++-- stylesheets/lfs-xsl/pdf.xsl | 4 ++-- stylesheets/lfs-xsl/pdf/lfs-lists.xsl | 6 +++--- stylesheets/lfs-xsl/pdf/lfs-mixed.xsl | 4 ++-- stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl | 2 +- stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl | 8 ++++---- stylesheets/lfs-xsl/xhtml/lfs-sections.xsl | 4 ++-- stylesheets/lfs-xsl/xhtml/lfs-toc.xsl | 2 +- stylesheets/patcheslist.xsl | 2 +- stylesheets/wget-list.xsl | 2 +- udev-lfs/README | 2 +- udev-lfs/init-net-rules.sh | 2 +- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/aux-file-data.sh b/aux-file-data.sh index 8be1b1d15..01539fef6 100755 --- a/aux-file-data.sh +++ b/aux-file-data.sh @@ -15,7 +15,7 @@ base=$(basename $bootscripts .tar.xz) bootsize=$(ls -l --block-size=1024 $bootscripts | cut -f5 -d" ") bootmd5=$(md5sum $bootscripts | cut -f1 -d" ") -# Figure intalled size of bootscripts +# Figure installed size of bootscripts TOPDIR=$(pwd) TMP_DIR=$(mktemp -d /tmp/lfsbootfiles.XXXXXX) pushd $TMP_DIR > /dev/null diff --git a/git-version.sh b/git-version.sh index 09a8fadd7..9d6c3fe0a 100755 --- a/git-version.sh +++ b/git-version.sh @@ -19,7 +19,7 @@ if [ -e LFS-RELEASE ]; then fi if ! git status > /dev/null; then - # Either it's not a git repository, or git is unavaliable. + # Either it's not a git repository or git is unavaliable. # Just workaround. echo " version.ent echo "" >> version.ent diff --git a/lfs-latest-git.php b/lfs-latest-git.php index ce76e970e..55c634e0b 100644 --- a/lfs-latest-git.php +++ b/lfs-latest-git.php @@ -322,7 +322,7 @@ function get_current() $file = basename( $line ) . "\n"; if ( preg_match( "/patch$/", $file ) ) { continue; } // Skip patches - $file = preg_replace( "/bz2/", '', $file ); // The 2 confusses the regex + $file = preg_replace( "/bz2/", '', $file ); // The 2 confuses the regex $file = rtrim( $file ); $pkg_pattern = "/(\D*).*/"; diff --git a/packages.ent b/packages.ent index 86242dd7d..e21d6b718 100644 --- a/packages.ent +++ b/packages.ent @@ -2,7 +2,7 @@ + Dropping unneeded anchors and fo:wrapper elemments. --> @@ -111,7 +111,7 @@ - + diff --git a/stylesheets/lfs-xsl/pdf.xsl b/stylesheets/lfs-xsl/pdf.xsl index ea247f5db..e1c03147c 100644 --- a/stylesheets/lfs-xsl/pdf.xsl +++ b/stylesheets/lfs-xsl/pdf.xsl @@ -27,7 +27,7 @@ - + @@ -93,7 +93,7 @@ + Addibg a bullet, left alignment, and @kepp-*.* attributes + for packages and patches list. --> @@ -135,7 +135,7 @@ diff --git a/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl b/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl index e5c7ae090..f38699e9c 100644 --- a/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl +++ b/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl @@ -128,7 +128,7 @@ + Be sure that literal will use always normal font weight. --> @@ -139,7 +139,7 @@ + literal, option, prompt, systemitem, varname, sgmltag, tag, and uri --> diff --git a/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl b/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl index 7ec85ddf4..5578fd661 100644 --- a/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl +++ b/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl @@ -176,7 +176,7 @@ + Small font size and left alignment. --> - + and that do not affect the chunk algorithm. --> @@ -187,7 +187,7 @@ @@ -208,7 +208,7 @@ - + diff --git a/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl b/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl index 36c4ba3fe..5dbe2136e 100644 --- a/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl +++ b/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl @@ -65,7 +65,7 @@ diff --git a/stylesheets/patcheslist.xsl b/stylesheets/patcheslist.xsl index f863edc1f..94e33b70b 100644 --- a/stylesheets/patcheslist.xsl +++ b/stylesheets/patcheslist.xsl @@ -51,7 +51,7 @@ exit - + diff --git a/stylesheets/wget-list.xsl b/stylesheets/wget-list.xsl index eca53a4c9..09f99cd22 100644 --- a/stylesheets/wget-list.xsl +++ b/stylesheets/wget-list.xsl @@ -15,7 +15,7 @@ + duplicated URLs due that may be split for PDF output --> version.ent echo "" >> version.ent diff --git a/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl b/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl index f38699e9c..834b7057c 100644 --- a/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl +++ b/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl @@ -5,7 +5,7 @@ version="1.0"> From 948cd148be899247236e1ab8e5a9be8e0be97e29 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 25 Aug 2024 15:32:24 +0800 Subject: [PATCH 4/4] 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 @@ - +