From cd88ee82f2266406200f93c7ef624eda16aaa551 Mon Sep 17 00:00:00 2001
From: EnumDev <enumdev@enumerated.dev>
Date: Mon, 7 Jul 2025 21:56:51 +0300
Subject: [PATCH] Prevent dbus-reload hook from throwing an error when dbus
 isn't running

---
 pkg.info                         | 2 +-
 source-files/dbus-reload.bpmhook | 2 +-
 source-files/dbus-reload.sh      | 8 ++++++++
 source.sh                        | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100755 source-files/dbus-reload.sh

diff --git a/pkg.info b/pkg.info
index 860130c..d38154c 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,7 +1,7 @@
 name: dbus
 description: Freedesktop.org message bus system
 version: 1.14.10
-revision: 5
+revision: 6
 url: https://www.freedesktop.org/wiki/Software/dbus
 license: AFL2.1 or GPL2-or-later
 architecture: any
diff --git a/source-files/dbus-reload.bpmhook b/source-files/dbus-reload.bpmhook
index 4137f34..fe6027c 100644
--- a/source-files/dbus-reload.bpmhook
+++ b/source-files/dbus-reload.bpmhook
@@ -2,4 +2,4 @@ trigger_operations: ["install", "upgrade", "remove"]
 target_type: "path"
 targets: ["etc/dbus-1/system.d/*.conf", "usr/share/dbus-1/system.d/*.conf", "usr/share/dbus-1/system-services/*.service"]
 depends: ["dbus"]
-run: "dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig"
+run: "/usr/sbin/dbus-reload"
diff --git a/source-files/dbus-reload.sh b/source-files/dbus-reload.sh
new file mode 100755
index 0000000..b6901a9
--- /dev/null
+++ b/source-files/dbus-reload.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo "Warning: this script should only be run by the dbus-reload BPM hook. Users should avoid running this script"
+
+# Reload system bus configuration
+dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig &> /dev/null
+
+exit 0
diff --git a/source.sh b/source.sh
index 502f967..00eaadd 100644
--- a/source.sh
+++ b/source.sh
@@ -45,6 +45,7 @@ package() {
   ln -sfv /etc/machine-id "$BPM_OUTPUT"/var/lib/dbus
 
   install -Dm644 "$BPM_WORKDIR"/dbus-reload.bpmhook "$BPM_OUTPUT"/var/lib/bpm/hooks/dbus-reload.bpmhook
+  install -Dm755 "$BPM_WORKDIR"/dbus-reload.sh "$BPM_OUTPUT"/usr/sbin/dbus-reload
   install -Dm644 "$BPM_WORKDIR"/dbus.esv "$BPM_OUTPUT"/etc/esvm/services/dbus.esv
 
   install -Dm644 "$BPM_SOURCE"/COPYING "$BPM_OUTPUT"/usr/share/licenses/dbus/COPYING