Skip to content

Commit

Permalink
fix(systemd-modules-load): misc repairs
Browse files Browse the repository at this point in the history
- Removing dependency on the systemd meta module since it causes circular dependency,
  prevents the existance of multiple systemd based meta modules and is redunant.

- Removing directory creation for modules-load since it should not be
  necessary and if it turns out that it is, it will be re-introduced in the
  form of a systemd tmpfile instead of inst_dir.

- Add a missing inclusion of configuration files placed in /usr/lib/modules-load.d
  and /etc/modules-load.d ( hostonly ) directories.

- Fix a spelling error in the systemd type unit file conf directory overwrite
  in the hostonly section.
  • Loading branch information
johannbg authored and haraldh committed Apr 22, 2021
1 parent b7d3cae commit 782ac8f
Showing 1 changed file with 12 additions and 16 deletions.
28 changes: 12 additions & 16 deletions modules.d/01systemd-modules-load/module-setup.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
# This file is part of dracut.
# SPDX-License-Identifier: GPL-2.0-or-later

Expand All @@ -16,33 +16,29 @@ check() {
# Module dependency requirements.
depends() {

# This module has external dependency on the systemd module.
echo systemd
# Return 0 to include the dependent systemd module in the initramfs.
# Return 0 to include the dependent module(s) in the initramfs.
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 systemd-modules-load related directories.
inst_dir "$modulesload"
inst_dir "$modulesloadconfdir"

# Install related files for systemd-modules-load
inst_multiple -o \
"$modulesload/*.conf" \
"$systemdutildir"/systemd-modules-load \
"$systemdsystemunitdir"/systemd-modules-load.service \
"$systemdutildir"/systemd-modules-load
"$systemdsystemunitdir"/sysinit.target.wants/systemd-modules-load.service

# Enable systemd type unit(s)
$SYSTEMCTL -q --root "$initdir" enable systemd-modules-load.service

# Install local user configurations if host only is enabled..
# Install the hosts local user configurations if enabled.
if [[ $hostonly ]]; then
inst_multiple -H -o \
"$modulesloadconfdir/*.conf" \
"$systemdsystemconfdir"/systemd-modules-load.service \
"$systemdsystemconfdir"/systemd-systemd-modules-load.d/*.conf
"$systemdsystemconfdir/systemd-modules-load.service.d/*.conf"
fi

# Enable the systemd type service unit for systemd-modules-load.
$SYSTEMCTL -q --root "$initdir" enable systemd-modules-load.service

}

0 comments on commit 782ac8f

Please sign in to comment.