From 0fd1918bfd11da763f3a6648fca9e469df8a7b64 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 17 Jul 2019 13:28:15 -0400 Subject: [PATCH] overlay: add Conflicts=boot.automount MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise, `systemd-gpt-auto-generator`'s generated `boot.automount` will cause a funky mount structure: ``` ├─/boot systemd-1 autofs │ └─/boot /dev/vda1 ext4 │ └─/boot/efi /dev/vda2 vfat ``` which then causes issues for us, especially around shutdown ordering. See also the linked systemd issue. I initially added `systemd.no_gpt=0` to the kargs in `image.yaml`, because it's better to just *not* have generated mount units in the first place. But I'm hesitant to resort to kargs yet, since it's something we don't control as easily as a unit file. (And ideally, it's only a temporary measure). Closes: https://github.com/coreos/fedora-coreos-tracker/issues/215 --- overlay/usr/lib/systemd/system/boot.mount | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/overlay/usr/lib/systemd/system/boot.mount b/overlay/usr/lib/systemd/system/boot.mount index 8fc86c36b3..79dfd06a5a 100644 --- a/overlay/usr/lib/systemd/system/boot.mount +++ b/overlay/usr/lib/systemd/system/boot.mount @@ -1,8 +1,9 @@ [Unit] Description=Boot partition Documentation=https://github.com/coreos/fedora-coreos-config -# This prevents the systemd-gpt-auto-generator from generating a mount unit for -# /boot using the ESP. +# This prevents the systemd-gpt-auto-generator generated mount unit +# from starting: https://github.com/systemd/systemd/issues/13099 +Conflicts=boot.automount [Mount] What=/dev/disk/by-label/boot