From 7359ba8acab2652cfff6b845f84a936cdec30f9d Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= Date: Sat, 1 May 2021 02:41:08 +0000 Subject: [PATCH] fix(systemd-sysusers): misc fixes and cleanup - module-setup.sh file permission corrected - comment section cleaned up - removal of dependency on systemd module - added inclution of the unit into the sysinit target - removal of systemctl enablement of type unit --- modules.d/01systemd-sysusers/module-setup.sh | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) mode change 100644 => 100755 modules.d/01systemd-sysusers/module-setup.sh diff --git a/modules.d/01systemd-sysusers/module-setup.sh b/modules.d/01systemd-sysusers/module-setup.sh old mode 100644 new mode 100755 index 58894f501..6073ad591 --- a/modules.d/01systemd-sysusers/module-setup.sh +++ b/modules.d/01systemd-sysusers/module-setup.sh @@ -1,12 +1,11 @@ -#!/bin/sh +#!/bin/bash # This file is part of dracut. # SPDX-License-Identifier: GPL-2.0-or-later # 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-sysusers || return 1 # Return 255 to only include the module, if another module requires it. @@ -22,17 +21,14 @@ 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 system users and groups configuration file. - # Install the systemd users and groups configuration file. - # Install the systemd type service unit for sysusers. - # Install the binary executable(s) for sysusers. inst_multiple -o \ "$sysusers"/basic.conf \ "$sysusers"/systemd.conf \ "$systemdsystemunitdir"/systemd-sysusers.service \ + "$systemdsystemunitdir"/sysinit.target.wants/systemd-sysusers.service \ systemd-sysusers # Install the hosts local user configurations if enabled. @@ -44,7 +40,4 @@ install() { "$systemdsystemconfdir/systemd-sysusers.service.d/*.conf" fi - # Enable the systemd type service unit for sysusers. - $SYSTEMCTL -q --root "$initdir" enable systemd-sysusers.service - } -- 2.47.3