[Buildroot] [PATCH] package/linux-tools: fix SysV init script

[Buildroot] [PATCH] package/linux-tools: fix SysV init script

[Jens Maus via buildroot]

This commit fixes the S10hyperv SysV init script which expects binaries
to be locate in /sbin while they are installed in /usr/sbin. Please
note, that the systemd init scripts correctly reference them.
Furthermore, the SysV init script did not check for an actual HyperV
environment to be present, which is also corrected. In addition, this
commit also fixes check-package warnings regarding a missing DAEMON
definition.

Signed-off-by: Jens Maus <mail@jens-maus.de>
---
 package/linux-tools/S10hyperv | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/linux-tools/S10hyperv b/package/linux-tools/S10hyperv
index 32887d1b6c..be9ed2c5df 100644
--- a/package/linux-tools/S10hyperv
+++ b/package/linux-tools/S10hyperv
@@ -2,14 +2,18 @@
 
 PROGS="@PROGS@"
 PIDDIR="/var/run"
+DAEMON="hyperv"
 
 # shellcheck source=/dev/null
-[ -r "/etc/default/hyperv" ] && . "/etc/default/hyperv"
+[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
+
+# only continue if we are in a HyperV platform
+[ -e "/sys/bus/vmbus" ] || exit 0
 
 start_one() {
 	printf 'Starting %s: ' "$1"
 	# shellcheck disable=SC2086 # we need the word splitting
-	start-stop-daemon -b -m -S -q -p "$PIDDIR/$1.pid" -x "/sbin/$1" -- -n
+	start-stop-daemon -b -m -S -q -p "$PIDDIR/$1.pid" -x "/usr/sbin/$1" -- -n
 	status=$?
 	if [ "$status" -eq 0 ]; then
 		echo "OK"
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/linux-tools: fix SysV init script

[Peter Korsgaard]

>>>>> "Jens" == Jens Maus via buildroot <buildroot@buildroot.org> writes:

 > This commit fixes the S10hyperv SysV init script which expects binaries
 > to be locate in /sbin while they are installed in /usr/sbin. Please
 > note, that the systemd init scripts correctly reference them.
 > Furthermore, the SysV init script did not check for an actual HyperV
 > environment to be present, which is also corrected. In addition, this
 > commit also fixes check-package warnings regarding a missing DAEMON
 > definition.

 > Signed-off-by: Jens Maus <mail@jens-maus.de>
 > ---
 >  package/linux-tools/S10hyperv | 8 ++++++--
 >  1 file changed, 6 insertions(+), 2 deletions(-)

This means we can now drop the entry in .checkpackageignore. Committed
with that included, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/linux-tools: fix SysV init script

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

>>>>> "Jens" == Jens Maus via buildroot <buildroot@buildroot.org> writes:
 >> This commit fixes the S10hyperv SysV init script which expects binaries
 >> to be locate in /sbin while they are installed in /usr/sbin. Please
 >> note, that the systemd init scripts correctly reference them.
 >> Furthermore, the SysV init script did not check for an actual HyperV
 >> environment to be present, which is also corrected. In addition, this
 >> commit also fixes check-package warnings regarding a missing DAEMON
 >> definition.

 >> Signed-off-by: Jens Maus <mail@jens-maus.de>
 >> ---
 >> package/linux-tools/S10hyperv | 8 ++++++--
 >> 1 file changed, 6 insertions(+), 2 deletions(-)

 > This means we can now drop the entry in .checkpackageignore. Committed
 > with that included, thanks.

Committed to 2023.02.x and 2023.08.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot