From 9d392a0c2d78ac890ce6fcbce6313b9cda007895 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 2 Sep 2020 20:23:18 +0000 Subject: [PATCH] manifest: Add bootupd for x86_64|aarch64 This converts the EFI update directory from (rpm-)ostree specific layout to bootupd layout. Required for both initial provisioning with bootupd as well as later updates. Required by: https://github.com/coreos/coreos-assembler/pull/1695 --- manifests/bootupd.yaml | 10 ++++++++++ manifests/fedora-coreos-base.yaml | 5 +++++ .../usr/lib/systemd/system-preset/45-fcos.preset | 2 ++ tests/kola/misc-ro | 5 +++++ 4 files changed, 22 insertions(+) create mode 100644 manifests/bootupd.yaml diff --git a/manifests/bootupd.yaml b/manifests/bootupd.yaml new file mode 100644 index 0000000000..3e1bcf82ba --- /dev/null +++ b/manifests/bootupd.yaml @@ -0,0 +1,10 @@ +# Integration with https://github.com/coreos/bootupd +# xref https://github.com/coreos/fedora-coreos-tracker/issues/510 +packages: + - bootupd + +postprocess: + - | + #!/bin/bash + set -xeuo pipefail + /usr/bin/bootupctl backend generate-update-metadata / diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml index f61ff0bc42..9c612a17ca 100644 --- a/manifests/fedora-coreos-base.yaml +++ b/manifests/fedora-coreos-base.yaml @@ -172,3 +172,8 @@ packages-ppc64le: - irqbalance packages-aarch64: - irqbalance + +# See https://github.com/coreos/bootupd +arch-include: + x86_64: bootupd.yaml + aarch64: bootupd.yaml diff --git a/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset b/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset index 54c813d3fa..da7d03366e 100644 --- a/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset +++ b/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset @@ -3,3 +3,5 @@ enable fedora-coreos-pinger.service # Provide information if no ignition is provided enable coreos-check-ignition-config.service enable coreos-check-ssh-keys.service +# See bootupd.yaml +enable bootupd.socket diff --git a/tests/kola/misc-ro b/tests/kola/misc-ro index 7efb939b30..94f1fd71e8 100755 --- a/tests/kola/misc-ro +++ b/tests/kola/misc-ro @@ -55,6 +55,11 @@ ok conditional initrd networking if ! test -f /usr/share/licenses/fedora-coreos-config/LICENSE; then fatal missing LICENSE fi +ok LICENSE + +case "$(arch)" in + x86_64|aarch64) bootupctl status; echo ok bootupctl;; +esac # check that no files are unlabeled unlabeled=$(find /var /etc -context '*:unlabeled_t:*')