From 5cd1a9fb137a8d74787befb4e9867590ed0e8559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= Date: Wed, 10 Feb 2021 13:36:28 +0000 Subject: [PATCH] fix: cosmetic comment fixes This rephrases a comment in the check() as requested on another PR and generalizes the install() section comments on par with other recent module changes. --- modules.d/01systemd-coredump/module-setup.sh | 11 ++--------- modules.d/01systemd-repart/module-setup.sh | 6 +----- modules.d/06dbus-broker/module-setup.sh | 15 ++------------- modules.d/06dbus-daemon/module-setup.sh | 12 ++---------- 4 files changed, 7 insertions(+), 37 deletions(-) diff --git a/modules.d/01systemd-coredump/module-setup.sh b/modules.d/01systemd-coredump/module-setup.sh index 8b85e93c..adb69777 100755 --- a/modules.d/01systemd-coredump/module-setup.sh +++ b/modules.d/01systemd-coredump/module-setup.sh @@ -5,8 +5,7 @@ # Prerequisite check(s) for module. check() { - # If the binary(s) requirements are not fulfilled - # return 1 to not include the binary. + # If the binary(s) requirements are not fulfilled the module can't be installed require_binaries coredumpctl || return 1 require_binaries $systemdutildir/systemd-coredump || return 1 @@ -25,16 +24,10 @@ depends() { } -# Install the required file(s) for the module in the initramfs. +# Install the required file(s) and directories for the module in the initramfs. install() { - # Install the required directories. inst_dir /var/lib/systemd/coredump - # Install the required file(s. - # Install the kernel configuration parameters for coredump. - # Install vendor configuration files. - # Install the systemd type service unit for coredump. - # Install the binary executable(s) for sysusers. inst_multiple -o \ $sysctld/50-coredump.conf \ $systemdutildir/coredump.conf \ diff --git a/modules.d/01systemd-repart/module-setup.sh b/modules.d/01systemd-repart/module-setup.sh index 6f370bd4..0c6b6b50 100755 --- a/modules.d/01systemd-repart/module-setup.sh +++ b/modules.d/01systemd-repart/module-setup.sh @@ -5,8 +5,7 @@ # Prerequisite check(s) for module. check() { - # If the binary(s) requirements are not fulfilled - # return 1 to not include the binary. + # If the binary(s) requirements are not fulfilled the module can't be installed require_binaries systemd-repart || return 1 # Return 255 to only include the module, if another module requires it. @@ -27,9 +26,6 @@ depends() { # Install the required file(s) for the module in the initramfs. install() { - # Install vendor repartition configurations - # Install the systemd type service unit for systemd repart. - # Install the binary executable(s) for systemd repart inst_multiple -o \ $libdir/repart.d/*.conf \ $systemdsystemunitdir/systemd-repart.service \ diff --git a/modules.d/06dbus-broker/module-setup.sh b/modules.d/06dbus-broker/module-setup.sh index d18deb41..efed8079 100755 --- a/modules.d/06dbus-broker/module-setup.sh +++ b/modules.d/06dbus-broker/module-setup.sh @@ -5,8 +5,7 @@ # Prerequisite check(s) for module. check() { - # If the binary(s) requirements are not fulfilled - # return 1 to not include the binary. + # If the binary(s) requirements are not fulfilled the module can't be installed require_binaries busctl || return 1 require_binaries dbus-broker || return 1 require_binaries dbus-broker-launch || return 1 @@ -25,7 +24,7 @@ depends() { } -# Install the required file(s) for the module in the initramfs. +# Install the required file(s) and directories for the module in the initramfs. install() { # Create dbus related directories. @@ -42,16 +41,6 @@ install() { inst_dir $dbussystemconfdir inst_dir $dbussystemservicesconfdir - # Install the dbus user session configuration file. - # Install the dbus system configuration file. - # The systemd module should be providing this and - # depend on the dbus module. Added here until it does. - # Install the dbus users and groups configuration file. - # Install the dbus-broker systemd journal message catalogs files. - # Install the systemd type service unit for dbus-broker. - # Install the systemd type socket unit for dbus. - # Install the dbus target. - # Install the binary executable(s) for dbus-broker. inst_multiple -o \ $dbus/session.conf \ $dbus/system.conf \ diff --git a/modules.d/06dbus-daemon/module-setup.sh b/modules.d/06dbus-daemon/module-setup.sh index 273dd3d7..fe0d64c4 100755 --- a/modules.d/06dbus-daemon/module-setup.sh +++ b/modules.d/06dbus-daemon/module-setup.sh @@ -5,8 +5,7 @@ # Prerequisite check(s) for module. check() { - # If the binary(s) requirements are not fulfilled - # return 1 to not include the binary. + # If the binary(s) requirements are not fulfilled the module can't be installed require_binaries busctl || return 1 require_binaries dbus-daemon || return 1 require_binaries dbus-send || return 1 @@ -30,7 +29,7 @@ depends() { return 0 } -# Install the required file(s) for the module in the initramfs. +# Install the required file(s) and directories for the module in the initramfs. install() { # Create dbus related directories. @@ -47,13 +46,6 @@ install() { inst_dir $dbussystemconfdir inst_dir $dbussystemservicesconfdir - # Install the dbus system configuration file. - # The systemd module should be providing this and - # depend on the dbus module. Added here until it does. - # Install the systemd type service unit for dbus. - # Install the systemd type socket unit for dbus. - # Install the dbus target. - # Install the binary executable(s) for dbus. inst_multiple -o \ $dbus/system.conf \ $dbussystem/org.freedesktop.systemd1.conf \