Skip to content

Commit

Permalink
fix(systemd-sysusers): misc fixes and cleanup
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
johannbg authored and haraldh committed May 4, 2021
1 parent 9f9bf8a commit 7359ba8
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions modules.d/01systemd-sysusers/module-setup.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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.
Expand All @@ -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

}

0 comments on commit 7359ba8

Please sign in to comment.