[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6dd7451f11385e984b2d24afff99360919f2d3a9

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6dd7451f11385e984b2d24afff99360919f2d3a9

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3894 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  6dd7451f11385e984b2d24afff99360919f2d3a9 (commit)
       via  1c9dcaf97639d229abef169c13a74b8beca82d19 (commit)
       via  c3019331df2bb393c96def62a56d33abdec72e8c (commit)
       via  dd8ef8cc107a867d4b2a739913b399f6966b34ff (commit)
      from  bff53f09ffb26cee1e410a2ee812efe4b83538d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6dd7451f11385e984b2d24afff99360919f2d3a9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Mar 1 16:14:14 2024 +0000

    core185: Ship initscript functions
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 1c9dcaf97639d229abef169c13a74b8beca82d19
Merge: bff53f09ff c3019331df
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Mar 1 16:13:45 2024 +0000

    Merge remote-tracking branch 'ms/initscripts' into next

commit c3019331df2bb393c96def62a56d33abdec72e8c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jan 11 15:59:34 2024 +0100

    initscripts: Implement storing PIDs in loadproc
    
    Some programs do not write their own PID files any more, but since our
    initscripts heavily rely on those, this extension allows to store it
    easily.
    
    Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>

commit dd8ef8cc107a867d4b2a739913b399f6966b34ff
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jan 11 15:57:50 2024 +0100

    initscripts: Fix wrong variable check for $PIDFILE in getpids
    
    getpids() checked whether it needed to pass a pid file to pidofproc, but
    the check was inverted.
    
    Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/185/filelists/files |  1 +
 src/initscripts/system/functions          | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/185/filelists/files b/config/rootfiles/core/185/filelists/files
index 8a0e5c49f..aa37655cf 100644
--- a/config/rootfiles/core/185/filelists/files
+++ b/config/rootfiles/core/185/filelists/files
@@ -1,3 +1,4 @@
+etc/rc.d/init.d/functions
 etc/sudoers.d/logwatch-mdadm
 lib/firmware/brcm/BCM-0a5c-6410.hcd
 lib/firmware/brcm/brcmfmac43012-sdio.bin
diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions
index 6f53a941b..5a26aef45 100644
--- a/src/initscripts/system/functions
+++ b/src/initscripts/system/functions
@@ -407,7 +407,7 @@ pidofproc()
 # This will ensure compatibility with previous LFS Bootscripts
 getpids()
 {
-	if [ -z "${PIDFILE}" ]; then
+	if [ -n "${PIDFILE}" ]; then
 		pidofproc -s -p "${PIDFILE}" $@
 	else
 		pidofproc -s $@
@@ -446,6 +446,7 @@ loadproc()
 	local pidfile=""
 	local forcestart=""
 	local nicelevel=""
+	local pid
 
 # This will ensure compatibility with previous LFS Bootscripts
 	if [ -n "${PIDFILE}" ];	then
@@ -521,12 +522,19 @@ loadproc()
 		(
 			${cmd} &>/dev/null
 		) &
+		pid="$!"
 		evaluate_retval
 	else
 		${cmd}
+		pid="$!"
 		evaluate_retval # This is "Probably" not LSB compliant, but required to be compatible with older bootscripts
 	fi
 
+	# Write the pidfile
+	if [ -n "${pid}" -a -n "${pidfile}" ]; then
+		echo "${pid}" > "${pidfile}"
+	fi
+
 	return 0
 }
 


hooks/post-receive
--
IPFire 2.x development tree