Skip to content

Commit

Permalink
Merge pull request #367 from aafeijoo-suse/SLE-15-SP5_Update-bsc1228398
Browse files Browse the repository at this point in the history
feat(systemd*): include systemd config files from /usr/lib/systemd (bsc#1228398) (SLE15-SP5:Update)
  • Loading branch information
aafeijoo-suse authored Aug 20, 2024
2 parents c701e6b + b3772c3 commit 7930ab2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
6 changes: 4 additions & 2 deletions modules.d/00systemd/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ install() {
"$systemdutildir"/system-generators/systemd-debug-generator \
"$systemdutildir"/system-generators/systemd-fstab-generator \
"$systemdutildir"/system-generators/systemd-gpt-auto-generator \
"$systemdutildir"/system.conf \
"$systemdutildir"/system.conf.d/*.conf \
\
"$systemdsystemunitdir"/debug-shell.service \
"$systemdsystemunitdir"/cryptsetup.target \
Expand Down Expand Up @@ -173,8 +175,8 @@ install() {
inst_multiple -H -o \
/etc/systemd/journald.conf \
/etc/systemd/journald.conf.d/*.conf \
/etc/systemd/system.conf \
/etc/systemd/system.conf.d/*.conf \
"$systemdutilconfdir"/system.conf \
"$systemdutilconfdir"/system.conf.d/*.conf \
"$systemdsystemconfdir"/[email protected] \
"$systemdsystemconfdir/[email protected]/*.conf" \
/etc/hosts \
Expand Down
5 changes: 3 additions & 2 deletions modules.d/01systemd-coredump/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ install() {
inst_multiple -o \
"$sysctld"/50-coredump.conf \
"$systemdutildir"/coredump.conf \
"$systemdsystemunitdir"/systemd-coredump \
"$systemdutildir/coredump.conf.d/*.conf" \
"$systemdutildir"/systemd-coredump \
"$systemdsystemunitdir"/systemd-coredump.socket \
"$systemdsystemunitdir"/[email protected] \
"$systemdsystemunitdir"/sockets.target.wants/systemd-coredump.socket \
Expand All @@ -44,7 +45,7 @@ install() {
if [[ $hostonly ]]; then
inst_multiple -H -o \
"$systemdutilconfdir"/coredump.conf \
"$systemdsystemconfdir/coredump.conf.d/*.conf" \
"$systemdutilconfdir/coredump.conf.d/*.conf" \
"$systemdsystemconfdir"/systemd-coredump.socket \
"$systemdsystemconfdir/systemd-coredump.socket.d/*.conf" \
"$systemdsystemconfdir"/[email protected] \
Expand Down
1 change: 1 addition & 0 deletions modules.d/01systemd-resolved/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ install() {
# Install the hosts local user configurations if enabled.
if [[ $hostonly ]]; then
inst_multiple -H -o \
"$systemdutilconfdir"/resolv.conf \
"$systemdutilconfdir"/resolved.conf \
"$systemdutilconfdir/resolved.conf.d/*.conf" \
"$systemdsystemconfdir"/systemd-resolved.service \
Expand Down
1 change: 1 addition & 0 deletions modules.d/01systemd-timesyncd/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ install() {
"$systemdutildir/ntp-units.d/*.list" \
"$systemdutildir"/systemd-timesyncd \
"$systemdutildir"/systemd-time-wait-sync \
"$systemdutildir"/timesyncd.conf \
"$systemdutildir/timesyncd.conf.d/*.conf" \
"$systemdsystemunitdir"/systemd-timesyncd.service \
"$systemdsystemunitdir/systemd-timesyncd.service.d/*.conf" \
Expand Down

0 comments on commit 7930ab2

Please sign in to comment.