Skip to content

Commit

Permalink
fix(systemd-sysusers): use split systemd sysuser configs
Browse files Browse the repository at this point in the history
Fixes the regression introduced by systemd/systemd#20056
As discussed in dracutdevs#1656 and dracutdevs#1657
  • Loading branch information
Cornelicorn authored and johannbg committed Dec 10, 2021
1 parent dcbe23c commit fec93bb
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 6 deletions.
4 changes: 3 additions & 1 deletion modules.d/01systemd-coredump/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ install() {
"$systemdsystemunitdir"/systemd-coredump.socket \
"$systemdsystemunitdir"/systemd-coredump@.service \
"$systemdsystemunitdir"/sockets.target.wants/systemd-coredump.socket \
"$sysusers"/systemd-coredump.conf \
coredumpctl

# Install the hosts local user configurations if enabled.
Expand All @@ -48,6 +49,7 @@ install() {
"$systemdsystemconfdir/systemd-coredump.socket.d/*.conf" \
"$systemdsystemconfdir"/systemd-coredump@.service \
"$systemdsystemconfdir/systemd-coredump@.service.d/*.conf" \
"$systemdsystemconfdir"/sockets.target.wants/systemd-coredump.socket
"$systemdsystemconfdir"/sockets.target.wants/systemd-coredump.socket \
"$sysusersconfdir"/systemd-coredump.conf
fi
}
4 changes: 3 additions & 1 deletion modules.d/01systemd-journald/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ install() {
"$systemdsystemunitdir"/sockets.target.wants/systemd-journald.socket \
"$systemdsystemunitdir"/sockets.target.wants/systemd-journald-audit.socket \
"$systemdsystemunitdir"/sysinit.target.wants/systemd-journald.service \
"$sysusers"/systemd-journal.conf \
journalctl

# Install library file(s)
Expand All @@ -66,7 +67,8 @@ install() {
"$systemdsystemconfdir"/systemd-journal-flush.service \
"$systemdsystemconfdir/systemd-journal-flush.service.d/*.conf" \
"$systemdsystemconfdir"/systemd-journal-catalog-update.service \
"$systemdsystemconfdir/systemd-journal-catalog-update.service.d/*.conf"
"$systemdsystemconfdir/systemd-journal-catalog-update.service.d/*.conf" \
"$sysusersconfdir"/systemd-journal.conf
fi

}
4 changes: 3 additions & 1 deletion modules.d/01systemd-networkd/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ install() {
"$systemdsystemunitdir"/systemd-network-generator.service \
"$systemdsystemunitdir"/systemd-networkd-wait-online.service \
"$systemdsystemunitdir"/systemd-network-generator.service \
"$sysusers"/systemd-network.conf \
networkctl ip

# Enable systemd type units
Expand All @@ -74,6 +75,7 @@ install() {
"$systemdsystemconfdir"/systemd-network-generator.service \
"$systemdsystemconfdir/systemd-network-generator.service/*.conf" \
"$systemdsystemconfdir"/systemd-networkd-wait-online.service \
"$systemdsystemconfdir/systemd-networkd-wait-online.service/*.conf"
"$systemdsystemconfdir/systemd-networkd-wait-online.service/*.conf" \
"$sysusersconfdir"/systemd-network.conf
fi
}
4 changes: 3 additions & 1 deletion modules.d/01systemd-resolved/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ install() {
"$systemdutildir"/systemd-resolved \
"$systemdsystemunitdir"/systemd-resolved.service \
"$systemdsystemunitdir/systemd-resolved.service.d/*.conf" \
"$sysusers"/systemd-resolve.conf \
resolvectl

# Enable systemd type unit(s)
Expand All @@ -51,6 +52,7 @@ install() {
"$systemdutilconfdir"/resolved.conf \
"$systemdutilconfdir/resolved.conf.d/*.conf" \
"$systemdsystemconfdir"/systemd-resolved.service \
"$systemdsystemconfdir/systemd-resolved.service/*.conf"
"$systemdsystemconfdir/systemd-resolved.service/*.conf" \
"$sysusersconfdir"/systemd-resolve.conf
fi
}
6 changes: 4 additions & 2 deletions modules.d/01systemd-timesyncd/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ install() {
"$systemdsystemunitdir"/systemd-timesyncd.service \
"$systemdsystemunitdir/systemd-timesyncd.service.d/*.conf" \
"$systemdsystemunitdir"/systemd-time-wait-sync.service \
"$systemdsystemunitdir/systemd-time-wait-sync.service.d/*.conf"
"$systemdsystemunitdir/systemd-time-wait-sync.service.d/*.conf" \
"$sysusers"/systemd-timesync.conf

# Enable systemd type unit(s)
for i in \
Expand All @@ -60,6 +61,7 @@ install() {
"$systemdsystemconfdir"/systemd-timesyncd.service \
"$systemdsystemconfdir/systemd-timesyncd.service.d/*.conf" \
"$systemdsystemunitdir"/systemd-time-wait-sync.service \
"$systemdsystemunitdir/systemd-time-wait-sync.service.d/*.conf"
"$systemdsystemunitdir/systemd-time-wait-sync.service.d/*.conf" \
"$sysusersconfdir"/systemd-timesync.conf
fi
}

0 comments on commit fec93bb

Please sign in to comment.