Skip to content

Commit

Permalink
fix(systemd-modules): remove dependency on systemd meta module
Browse files Browse the repository at this point in the history
Depending on systemd meta module causes circular dependency,
prevents the existance of multiple systemd based meta modules
and is redunant.
  • Loading branch information
johannbg authored and haraldh committed Apr 22, 2021
1 parent 2257d54 commit afef455
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 12 deletions.
4 changes: 1 addition & 3 deletions modules.d/01systemd-ask-password/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ 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

}
Expand Down
4 changes: 2 additions & 2 deletions modules.d/01systemd-coredump/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ check() {
depends() {

# This module has external dependency on the systemd module.
echo systemd systemd-journald systemd-sysctl
# Return 0 to include the dependent systemd module in the initramfs.
echo systemd-journald systemd-sysctl
# Return 0 to include the dependent module(s) in the initramfs.
return 0

}
Expand Down
4 changes: 1 addition & 3 deletions modules.d/01systemd-repart/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ 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

}
Expand Down
2 changes: 1 addition & 1 deletion modules.d/01systemd-sysctl/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ check() {
depends() {

# This module has external dependency on other module(s).
echo systemd systemd-modules-load
echo systemd-modules-load
# Return 0 to include the dependent module(s) in the initramfs.
return 0

Expand Down
4 changes: 1 addition & 3 deletions modules.d/01systemd-sysusers/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ 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

}
Expand Down

0 comments on commit afef455

Please sign in to comment.