Skip to content

Commit

Permalink
fix(dbus-daemon): only error out in install()
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
haraldh committed Apr 17, 2021
1 parent 64ee2a5 commit ae4fbb3
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions modules.d/06dbus-daemon/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ check() {
require_binaries dbus-daemon || return 1
require_binaries dbus-send || return 1

# dbus conflicts with dbus-broker.
if dracut_module_included "dbus-broker"; then
derror "dbus conflicts with dbus-broker in the initramfs."
exit 1
fi

# Return 255 to only include the module, if another module requires it.
return 255
}
Expand All @@ -31,6 +25,11 @@ depends() {

# Install the required file(s) and directories for the module in the initramfs.
install() {
# dbus conflicts with dbus-broker.
if dracut_module_included "dbus-broker"; then
derror "dbus conflicts with dbus-broker in the initramfs."
return 1
fi

# Create dbus related directories.
inst_dir "$dbus"
Expand Down

0 comments on commit ae4fbb3

Please sign in to comment.