diff options
| author | Jonathan Lebon <jonathan@jlebon.com> | 2018-10-18 16:44:05 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-10-19 15:41:10 +0000 |
| commit | a4a49724d6f898fd5e76bd6de49d36f7ed8d237e (patch) | |
| tree | 83163020addcf6290155171cb6d3147c7d186eb7 /src/boot/ostree-prepare-root.service | |
| parent | ae99b9ccdc0ba0b75f3877461d5cc2b3b49fd9be (diff) | |
| download | ostree-a4a49724d6f898fd5e76bd6de49d36f7ed8d237e.tar.gz | |
ostree-prepare-root.service: Run earlier in initrd
Previously, we were preparing the root very late in the boot process;
right before we switch root. The issue with that is that most services
in the initrd that run `After=initrd-root-fs.target` expect that
`/sysroot` already points to the rootfs we'll be pivoting to. Running
this late violates that assumption.
This patch fixes this by making `ostree-prepare-root.service` instead
run right after `sysroot.mount` (the physical sysroot mounted by
systemd) but still before `initrd-root-fs.target` (which is the target
signalling that `/sysroot` is now valid and ready).
This should make it easier to integrate OSTree with other initrd
services such as Ignition.
Related: https://github.com/dustymabe/ignition-dracut/issues/20
Closes: #1759
Approved by: cgwalters
Diffstat (limited to 'src/boot/ostree-prepare-root.service')
| -rw-r--r-- | src/boot/ostree-prepare-root.service | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/boot/ostree-prepare-root.service b/src/boot/ostree-prepare-root.service index 455afc3e..63357581 100644 --- a/src/boot/ostree-prepare-root.service +++ b/src/boot/ostree-prepare-root.service @@ -22,9 +22,8 @@ DefaultDependencies=no ConditionKernelCommandLine=ostree ConditionPathExists=/etc/initrd-release OnFailure=emergency.target -After=initrd-switch-root.target -Before=initrd-switch-root.service -Before=plymouth-switch-root.service +After=sysroot.mount +Before=initrd-root-fs.target [Service] Type=oneshot |