diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-05-12 12:47:09 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-05-12 12:47:09 +0000 |
| commit | b959dcfcd0319d4311e67fa40ebb407605efc9d9 (patch) | |
| tree | ac91bd6261967ff19b62a1859a4f544112ec4522 /systemd | |
| parent | Releasing debian version 4.2+20230313-1. (diff) | |
| download | mdadm-b959dcfcd0319d4311e67fa40ebb407605efc9d9.tar.xz mdadm-b959dcfcd0319d4311e67fa40ebb407605efc9d9.zip | |
Merging upstream version 4.2+20230508.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/mdadm-grow-continue@.service | 1 | ||||
| -rw-r--r-- | systemd/mdcheck_continue.service | 2 | ||||
| -rw-r--r-- | systemd/mdcheck_start.service | 2 | ||||
| -rw-r--r-- | systemd/mdmon@.service | 15 |
4 files changed, 8 insertions, 12 deletions
diff --git a/systemd/mdadm-grow-continue@.service b/systemd/mdadm-grow-continue@.service index 9ccadca..64b8254 100644 --- a/systemd/mdadm-grow-continue@.service +++ b/systemd/mdadm-grow-continue@.service @@ -15,4 +15,3 @@ ExecStart=BINDIR/mdadm --grow --continue /dev/%I StandardInput=null StandardOutput=null StandardError=null -KillMode=none diff --git a/systemd/mdcheck_continue.service b/systemd/mdcheck_continue.service index f532490..70892a1 100644 --- a/systemd/mdcheck_continue.service +++ b/systemd/mdcheck_continue.service @@ -13,6 +13,4 @@ Documentation=man:mdadm(8) [Service] Type=oneshot Environment="MDADM_CHECK_DURATION=6 hours" -EnvironmentFile=-/run/sysconfig/mdadm -ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh ExecStart=/usr/share/mdadm/mdcheck --continue --duration ${MDADM_CHECK_DURATION} diff --git a/systemd/mdcheck_start.service b/systemd/mdcheck_start.service index 703a658..fc4fc43 100644 --- a/systemd/mdcheck_start.service +++ b/systemd/mdcheck_start.service @@ -13,6 +13,4 @@ Documentation=man:mdadm(8) [Service] Type=oneshot Environment="MDADM_CHECK_DURATION=6 hours" -EnvironmentFile=-/run/sysconfig/mdadm -ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh ExecStart=/usr/share/mdadm/mdcheck --duration ${MDADM_CHECK_DURATION} diff --git a/systemd/mdmon@.service b/systemd/mdmon@.service index cb6482d..020cc7e 100644 --- a/systemd/mdmon@.service +++ b/systemd/mdmon@.service @@ -6,24 +6,25 @@ # (at your option) any later version. [Unit] -Description=MD Metadata Monitor on /dev/%I +Description=MD Metadata Monitor on %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, -# that is mdadm's job if at all. -Environment=IMSM_NO_PLATFORM=1 # The mdmon starting in the initramfs (with dracut at least) # cannot see sysfs after root is mounted, so we will have to # 'takeover'. As the '--offroot --takeover' don't hurt when # not necessary, are are useful with root-on-md in dracut, # have them always present. -ExecStart=BINDIR/mdmon --offroot --takeover %I -Type=forking +ExecStart=BINDIR/mdmon --foreground --offroot --takeover %I # Don't set the PIDFile. It isn't necessary (systemd can work # 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 |