Skip to content

Commit

Permalink
fedora-coreos-base.yaml: nuke systemd-gpt-auto-generator
Browse files Browse the repository at this point in the history
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
```

The nature of `autofs` then causes issues for us around shutdown
ordering. See also the linked systemd issue.

Really, we don't need the GPT generator at all for now, so just nuke it
from the tree.

Closes: coreos/fedora-coreos-tracker#215
  • Loading branch information
jlebon committed Jul 17, 2019
1 parent 936933e commit 5402a4a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 4 additions & 0 deletions fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ remove-from-packages:
/usr/lib/systemd/system/systemd-resolved.service,
/usr/lib/systemd/system/sysinit.target.wants/systemd-firstboot.service]

# We don't want auto-generated mount units. See also
# https://github.com/systemd/systemd/issues/13099
- [systemd-udev, /usr/lib/systemd/system-generators/systemd-gpt-auto-generator]

# The grub bits are mainly designed for desktops, and IMO haven't seen
# enough testing in concert with ostree. At some point we'll flesh out
# the full plan in https://github.com/coreos/fedora-coreos-tracker/issues/47
Expand Down
2 changes: 0 additions & 2 deletions overlay/usr/lib/systemd/system/boot.mount
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
[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.

[Mount]
What=/dev/disk/by-label/boot
Expand Down

0 comments on commit 5402a4a

Please sign in to comment.