Skip to content

Commit ae4fbb3

Browse files
committed
fix(dbus-daemon): only error out in install()
Don't hard exit in `check()`. The transaction logic only checks if it should/can include the module. Just return `255` and the `dbus` meta module will pick its dependency.
1 parent 64ee2a5 commit ae4fbb3

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

modules.d/06dbus-daemon/module-setup.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ check() {
1010
require_binaries dbus-daemon || return 1
1111
require_binaries dbus-send || return 1
1212

13-
# dbus conflicts with dbus-broker.
14-
if dracut_module_included "dbus-broker"; then
15-
derror "dbus conflicts with dbus-broker in the initramfs."
16-
exit 1
17-
fi
18-
1913
# Return 255 to only include the module, if another module requires it.
2014
return 255
2115
}
@@ -31,6 +25,11 @@ depends() {
3125

3226
# Install the required file(s) and directories for the module in the initramfs.
3327
install() {
28+
# dbus conflicts with dbus-broker.
29+
if dracut_module_included "dbus-broker"; then
30+
derror "dbus conflicts with dbus-broker in the initramfs."
31+
return 1
32+
fi
3433

3534
# Create dbus related directories.
3635
inst_dir "$dbus"

0 commit comments

Comments
 (0)