Skip to content

Commit

Permalink
manifest: Add bootupd for x86_64|aarch64 (socket disabled)
Browse files Browse the repository at this point in the history
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.

For now the `bootupd.socket` is disabled by default to further
discourage users from trying it until we've fully productized it.

This will be used by: coreos/coreos-assembler#1695
  • Loading branch information
cgwalters committed Sep 22, 2020
1 parent c2b4211 commit ecdb18d
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 0 deletions.
3 changes: 3 additions & 0 deletions manifest-lock.x86_64.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
"bind-utils": {
"evra": "32:9.11.22-1.fc32.x86_64"
},
"bootupd": {
"evra": "0.1.1-1.fc32.x86_64"
},
"bsdtar": {
"evra": "3.4.3-1.fc32.x86_64"
},
Expand Down
11 changes: 11 additions & 0 deletions manifests/bootupd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# 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
# Transforms /usr/lib/ostree-boot into a bootupd-compatible update payload
/usr/bin/bootupctl backend generate-update-metadata /
5 changes: 5 additions & 0 deletions manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ enable [email protected]
enable zincati.service
# Testing aid
enable coreos-liveiso-success.service
# See bootupd.yaml - not enabled by default right now
# enable bootupd.socket
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ enable fedora-coreos-pinger.service
# Provide information if no ignition is provided
enable coreos-check-ignition-config.service
enable coreos-check-ssh-keys.service

12 changes: 12 additions & 0 deletions tests/kola/misc-ro
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@ 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)
if systemctl is-enabled bootupd.socket; then
fatal "Not expecting bootupd.socket to be enabled"
fi
systemctl start bootupd.socket
bootupctl status
echo ok bootupctl
;;
esac

# check that no files are unlabeled
unlabeled=$(find /var /etc -context '*:unlabeled_t:*')
Expand Down

0 comments on commit ecdb18d

Please sign in to comment.