diff options
author | Alex Kiernan <alex.kiernan@hivehome.com> | 2018-06-30 17:03:51 +0000 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-03 13:38:10 +0000 |
commit | a0527e70866bbb29f98e72b3e697f886b3aa8393 (patch) | |
tree | b233590ff2f2fc1e26a752435cde7e3a0d72335c | |
parent | 0c8b86ea09e31b5c3b7138854cf42dc845b6f5c8 (diff) | |
download | ostree-a0527e70866bbb29f98e72b3e697f886b3aa8393.tar.gz |
boot: Use emergency.target, not emergency.service
Follow systemd units in using emergency.target, not emergency.service
(which is the sole unit, by default, in emergency.target) so we can
easily reconfigure the units which are actived when entering
emergency mode.
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Closes: #1665
Approved by: cgwalters
-rw-r--r-- | src/boot/ostree-prepare-root.service | 2 | ||||
-rw-r--r-- | src/boot/ostree-remount.service | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/boot/ostree-prepare-root.service b/src/boot/ostree-prepare-root.service index e0659d10..52cf8863 100644 --- a/src/boot/ostree-prepare-root.service +++ b/src/boot/ostree-prepare-root.service @@ -20,7 +20,7 @@ Description=OSTree Prepare OS/ DefaultDependencies=no ConditionKernelCommandLine=ostree ConditionPathExists=/etc/initrd-release -OnFailure=emergency.service +OnFailure=emergency.target After=initrd-switch-root.target Before=initrd-switch-root.service Before=plymouth-switch-root.service diff --git a/src/boot/ostree-remount.service b/src/boot/ostree-remount.service index 8439b495..68209f96 100644 --- a/src/boot/ostree-remount.service +++ b/src/boot/ostree-remount.service @@ -19,7 +19,7 @@ Description=OSTree Remount OS/ bind mounts DefaultDependencies=no ConditionKernelCommandLine=ostree -OnFailure=emergency.service +OnFailure=emergency.target Conflicts=umount.target After=-.mount After=systemd-remount-fs.service |