Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- lfs/dbus | 2 +- src/initscripts/packages/messagebus | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lfs/dbus b/lfs/dbus index 06431b4b5..09f4a541b 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dbus -PAK_VER = 3 +PAK_VER = 4
DEPS =
diff --git a/src/initscripts/packages/messagebus b/src/initscripts/packages/messagebus index fc719c99a..3ea80bc92 100644 --- a/src/initscripts/packages/messagebus +++ b/src/initscripts/packages/messagebus @@ -32,7 +32,12 @@ case "$1" in $0 start ;;
- status) + reload) + boot_mesg "Reloading the D-Bus Messagebus Daemon..." + reloadproc /usr/bin/dbus-daemon + ;; + + status) statusproc -p $pidfile /usr/bin/dbus-daemon ;;
Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- lfs/avahi | 2 +- src/paks/avahi/install.sh | 4 ++++ src/paks/avahi/uninstall.sh | 1 + 3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/lfs/avahi b/lfs/avahi index 4b2b79ded..ae166a88c 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = avahi -PAK_VER = 7 +PAK_VER = 8
DEPS = dbus libdaemon
diff --git a/src/paks/avahi/install.sh b/src/paks/avahi/install.sh index cb0266bae..9ec3050a1 100644 --- a/src/paks/avahi/install.sh +++ b/src/paks/avahi/install.sh @@ -34,4 +34,8 @@ ln -svf ../init.d/avahi /etc/rc.d/rc3.d/S65avahi ln -svf ../init.d/avahi /etc/rc.d/rc0.d/K35avahi ln -svf ../init.d/avahi /etc/rc.d/rc6.d/K35avahi restore_backup ${NAME} + +# Reload dbus to load avahi configuration +/etc/init.d/messagebus reload + start_service --background ${NAME} diff --git a/src/paks/avahi/uninstall.sh b/src/paks/avahi/uninstall.sh index 1c8e67c9a..1a5d7a620 100644 --- a/src/paks/avahi/uninstall.sh +++ b/src/paks/avahi/uninstall.sh @@ -26,3 +26,4 @@ stop_service ${NAME} make_backup ${NAME} remove_files rm -rf /etc/rc.d/rc*.d/*avahi +/etc/init.d/messagebus reload
Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- src/paks/cups/install.sh | 1 + src/paks/cups/uninstall.sh | 1 + 2 files changed, 2 insertions(+)
diff --git a/src/paks/cups/install.sh b/src/paks/cups/install.sh index 38715f9e8..b3f0f1368 100644 --- a/src/paks/cups/install.sh +++ b/src/paks/cups/install.sh @@ -23,6 +23,7 @@ # . /opt/pakfire/lib/functions.sh extract_files +/etc/init.d/messagebus reload start_service --delay 300 --background ${NAME} ln -svf ../init.d/cups /etc/rc.d/rc0.d/K00cups ln -svf ../init.d/cups /etc/rc.d/rc3.d/S25cups diff --git a/src/paks/cups/uninstall.sh b/src/paks/cups/uninstall.sh index 744c2062d..01b13de76 100644 --- a/src/paks/cups/uninstall.sh +++ b/src/paks/cups/uninstall.sh @@ -25,3 +25,4 @@ stop_service ${NAME} remove_files rm -rf /etc/rc.d/rc*.d/*cups +/etc/init.d/messagebus reload
Hi Michael,
Doesn't this patch also require the pak_ver to be incremented as was done for the avahi addon?
Regards,
Adolf.
On 21/07/2021 16:41, Michael Tremer wrote:
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
src/paks/cups/install.sh | 1 + src/paks/cups/uninstall.sh | 1 + 2 files changed, 2 insertions(+)
diff --git a/src/paks/cups/install.sh b/src/paks/cups/install.sh index 38715f9e8..b3f0f1368 100644 --- a/src/paks/cups/install.sh +++ b/src/paks/cups/install.sh @@ -23,6 +23,7 @@ # . /opt/pakfire/lib/functions.sh extract_files +/etc/init.d/messagebus reload start_service --delay 300 --background ${NAME} ln -svf ../init.d/cups /etc/rc.d/rc0.d/K00cups ln -svf ../init.d/cups /etc/rc.d/rc3.d/S25cups diff --git a/src/paks/cups/uninstall.sh b/src/paks/cups/uninstall.sh index 744c2062d..01b13de76 100644 --- a/src/paks/cups/uninstall.sh +++ b/src/paks/cups/uninstall.sh @@ -25,3 +25,4 @@ stop_service ${NAME} remove_files rm -rf /etc/rc.d/rc*.d/*cups +/etc/init.d/messagebus reload
Yes it does, I forgot :( Thank you for letting me know.
Since this is merged, I will send another patch.
-Michael
On 22 Jul 2021, at 20:18, Adolf Belka adolf.belka@ipfire.org wrote:
Hi Michael,
Doesn't this patch also require the pak_ver to be incremented as was done for the avahi addon?
Regards,
Adolf.
On 21/07/2021 16:41, Michael Tremer wrote:
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
src/paks/cups/install.sh | 1 + src/paks/cups/uninstall.sh | 1 + 2 files changed, 2 insertions(+)
diff --git a/src/paks/cups/install.sh b/src/paks/cups/install.sh index 38715f9e8..b3f0f1368 100644 --- a/src/paks/cups/install.sh +++ b/src/paks/cups/install.sh @@ -23,6 +23,7 @@ # . /opt/pakfire/lib/functions.sh extract_files +/etc/init.d/messagebus reload start_service --delay 300 --background ${NAME} ln -svf ../init.d/cups /etc/rc.d/rc0.d/K00cups ln -svf ../init.d/cups /etc/rc.d/rc3.d/S25cups diff --git a/src/paks/cups/uninstall.sh b/src/paks/cups/uninstall.sh index 744c2062d..01b13de76 100644 --- a/src/paks/cups/uninstall.sh +++ b/src/paks/cups/uninstall.sh @@ -25,3 +25,4 @@ stop_service ${NAME} remove_files rm -rf /etc/rc.d/rc*.d/*cups +/etc/init.d/messagebus reload
-
Adolf Belka -
Michael Tremer