diff options
| author | NeilBrown <neilb@suse.de> | 2023-03-13 14:42:58 +1100 |
|---|---|---|
| committer | Jes Sorensen <jes@trained-monkey.org> | 2023-03-19 12:33:25 -0400 |
| commit | 0f9a4b3e11fbe4f8631d20b1f89cf43e9219db55 (patch) | |
| tree | 8528017ebda2f149f77eaee1341308a4bc92f687 | |
| parent | 6660e33edde76329bd3b7f03383856c7efee2aa9 (diff) | |
| download | mdadm-0f9a4b3e11fbe4f8631d20b1f89cf43e9219db55.tar.gz | |
mdmon: Remove need for KillMode=none
mdmon needs to keep running during the switchroot out of (at boot) and
then back into (at shutdown) the initrd. It runs until a new mdmon
takes over.
Killmode=none is used to achieve this, with the help of --offroot which
sets argv[0][0] to '@' which systemd understands.
This is needed because mdmon is currently run in system-mdmon.slice
which conflicts with shutdown.target so without Killmode=none mdmon
would get killed early in shutdown when system.mdmon.slice is removed.
As described in systemd.service(5), this conflict with shutdown can be
resolved by explicitly requesting system.slice, which is a natural
counterpart to DefaultDependencies=no.
So add that, and also add IgnoreOnIsolate=true to avoid another possible
source of an early death. With these we no longer need KillMode=none
which the systemd developers have marked as "deprecated".
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
| -rw-r--r-- | systemd/mdmon@.service | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/systemd/mdmon@.service b/systemd/mdmon@.service index bba9b0e..303ad05 100644 --- a/systemd/mdmon@.service +++ b/systemd/mdmon@.service @@ -10,6 +10,9 @@ Description=MD Metadata Monitor on /dev/%I DefaultDependencies=no Before=initrd-switch-root.target Documentation=man:mdmon(8) +# Allow mdmon to keep running after switchroot, until a new +# instance is started. +IgnoreOnIsolate=true [Service] # mdmon should never complain due to lack of a platform, @@ -25,4 +28,6 @@ ExecStart=BINDIR/mdmon --foreground --offroot --takeover %I # it out) and systemd will remove it when transitioning from # initramfs to rootfs. #PIDFile=/run/mdadm/%I.pid -KillMode=none +# The default slice is system-mdmon.slice which Conflicts +# with shutdown, causing mdmon to exit early. So use system.slice. +Slice=system.slice |