[lfs] branch trunk updated: Update network boot script corner case.
| Newsgroups | gmane.linux.lfs.book |
|---|---|
| Message-ID | <175626633748.31192.12030239013765645699@rivendell.linuxfromscratch.org> |
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch trunk
in repository lfs.
The following commit(s) were added to refs/heads/trunk by this push:
new 09e60338b Update network boot script corner case.
new 24852bb9b Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk
09e60338b is described below
commit 09e60338b08175aebb9ace428ff596b7155f2ae9
Author: Bruce Dubbs <[email protected]>
AuthorDate: Tue Aug 26 22:44:28 2025 -0500
Update network boot script corner case.
Change 'return' to exit in network script.
---
bootscripts/ChangeLog | 3 +++
bootscripts/lfs/init.d/network | 2 +-
chapter01/changelog.xml | 9 +++++++++
chapter01/whatsnew.xml | 4 ++--
packages.ent | 2 +-
5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index 41576792f..85a0de5b7 100644
--- a/bootscripts/ChangeLog
+++ b/bootscripts/ChangeLog
@@ -1,3 +1,6 @@
+2025-08-27 Bruce Dubbs <[email protected]>
+ * Change 'return' to exit in network script.
+
2024-08-25 Xi Ruoyao <[email protected]>
* Remove an empty line and an outdated comment (not valid anymore after
/usr merge) from init-functions.
diff --git a/bootscripts/lfs/init.d/network b/bootscripts/lfs/init.d/network
index 5b2dd9b97..a15afc927 100644
--- a/bootscripts/lfs/init.d/network
+++ b/bootscripts/lfs/init.d/network
@@ -30,7 +30,7 @@
case "${1}" in
start)
# if the default route exists, network is already configured
- if ip route | grep -q "^default"; then return 0; fi
+ if ip route | grep -q "^default"; then exit 0; fi
# Start all network interfaces
for file in /etc/sysconfig/ifconfig.*
do
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 80d1b1ce8..11123c353 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,15 @@
appropriate for the entry or if needed the entire day's listitem.
-->
+ <listitem revision='sysv'>
+ <para>2025-08-27</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update network boot script corner case.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem>
<para>2025-08-15</para>
<itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0df323756..bb61020ff 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -143,9 +143,9 @@
<listitem>
<para>Less-&less-version;</para>
</listitem>
- <!--<listitem>
+ <listitem>
<para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
- </listitem>-->
+ </listitem>
<listitem>
<para>Libcap-&libcap-version;</para>
</listitem>
diff --git a/packages.ent b/packages.ent
index a943a3968..9c158c48c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -373,7 +373,7 @@
<!ENTITY less-fin-du "16 MB">
<!ENTITY less-fin-sbu "less than 0.1 SBU">
-<!ENTITY lfs-bootscripts-version "20240825"> <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20250827"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
--
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page