From: Adolf Belka <adolf.belka@ipfire.org>
Date: Wed, 26 Apr 2023 12:32:29 +0000 (+0200)
Subject: dbus: Fixes Bug#13094 - dbus daemon continues running after uninstall
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7101e472a0901963ecf4556734633b72473ea09b;p=people%2Fms%2Fipfire-2.x.git

dbus: Fixes Bug#13094 - dbus daemon continues running after uninstall

- The uninstall.sh script had stop_service ${NAME} but the package name is dbus while the
   initscript is named messagebus. Therefore the stop_service never stops the dbus daemon.
- This patch changes the line to stop_service messagebus
- The install.sh script already has start_service messagebus
- Bump PAK_VER for dbus

Fixes: Bug#13094
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/dbus b/lfs/dbus
index 7d123e4ef9..f6f9c90a58 100644
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = dbus
-PAK_VER    = 9
+PAK_VER    = 10
 
 DEPS       =
 
diff --git a/src/paks/dbus/uninstall.sh b/src/paks/dbus/uninstall.sh
index 49fc30e300..1c0573735c 100644
--- a/src/paks/dbus/uninstall.sh
+++ b/src/paks/dbus/uninstall.sh
@@ -22,7 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
+stop_service messagebus
 
 # Remove start files
 rm -rf /etc/rc.d/rc*.d/*messagebus