diff options
| -rw-r--r-- | meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service | 14 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service | 14 |
2 files changed, 4 insertions, 24 deletions
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service index 4bd411e75f..4fad8fad78 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service @@ -4,19 +4,9 @@ Wants=obmc-mapper.target After=obmc-mapper.target [Service] -# We are using a Type=simple service instead of the normal Type=oneshot -# since Type=oneshot can't have Restart= lines -# https://github.com/systemd/systemd/issues/2582 -# Unfortunately Type=oneshot services halt any services which order after -# the oneshot on the completion of ExecStart= lines. For Type=simple, the -# halting is only until ExecStartPre lines have completed and ExecStart has -# begun executing. Since we want to wait for the `mapper wait` process to -# finish, it must be an ExecStartPre. All Type=simple services require an -# ExecStart so we use `true` as a placeholder to satisfy the requirement. -Type=simple +Type=oneshot RemainAfterExit=no Restart=on-failure TimeoutStartSec=infinity -ExecStartPre=/usr/bin/env mapper subtree-remove %I -ExecStart=/usr/bin/env true +ExecStart=/usr/bin/env mapper subtree-remove %I SyslogIdentifier=mapper diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service index f7744e2d8b..d61309097c 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service @@ -4,19 +4,9 @@ Wants=obmc-mapper.target After=obmc-mapper.target [Service] -# We are using a Type=simple service instead of the normal Type=oneshot -# since Type=oneshot can't have Restart= lines -# https://github.com/systemd/systemd/issues/2582 -# Unfortunately Type=oneshot services halt any services which order after -# the oneshot on the completion of ExecStart= lines. For Type=simple, the -# halting is only until ExecStartPre lines have completed and ExecStart has -# begun executing. Since we want to wait for the `mapper wait` process to -# finish, it must be an ExecStartPre. All Type=simple services require an -# ExecStart so we use `true` as a placeholder to satisfy the requirement. -Type=simple +Type=oneshot RemainAfterExit=yes Restart=on-failure TimeoutStartSec=infinity -ExecStartPre=/usr/bin/env mapper wait %I -ExecStart=/usr/bin/env true +ExecStart=/usr/bin/env mapper wait %I SyslogIdentifier=mapper |