diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 02:19:40 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 02:19:40 +0000 |
| commit | 0a0abc373c07a7744adac48891a393e0882fdb6f (patch) | |
| tree | 725955c83a4b5835007e94d0f85bb908d42ca897 /units | |
| parent | Releasing progress-linux version 252.23-1~deb12u1progress7u1. (diff) | |
| download | systemd-0a0abc373c07a7744adac48891a393e0882fdb6f.tar.xz systemd-0a0abc373c07a7744adac48891a393e0882fdb6f.zip | |
Merging upstream version 252.25.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-journal-upload.service.in | 2 | ||||
| -rw-r--r-- | units/systemd-modules-load.service.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/units/systemd-journal-upload.service.in b/units/systemd-journal-upload.service.in index 7e64870..18365a8 100644 --- a/units/systemd-journal-upload.service.in +++ b/units/systemd-journal-upload.service.in @@ -27,8 +27,6 @@ ProtectKernelLogs=yes ProtectKernelModules=yes ProtectKernelTunables=yes Restart=on-failure -RestartSteps=10 -RestartMaxDelaySec=60 RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 RestrictNamespaces=yes RestrictRealtime=yes diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in index 604d871..9c5be76 100644 --- a/units/systemd-modules-load.service.in +++ b/units/systemd-modules-load.service.in @@ -20,7 +20,9 @@ ConditionDirectoryNotEmpty=|/usr/local/lib/modules-load.d ConditionDirectoryNotEmpty=|/etc/modules-load.d ConditionDirectoryNotEmpty=|/run/modules-load.d ConditionKernelCommandLine=|modules-load +ConditionKernelCommandLine=|modules_load ConditionKernelCommandLine=|rd.modules-load +ConditionKernelCommandLine=|rd.modules_load [Service] Type=oneshot |