Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kairos-io/kairos
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8a0d506cf88af8bc7d7097e03d29cbf0df6e6778
Choose a base ref
..
head repository: kairos-io/kairos
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2e402c08c6efc527ee26bc0b2c5730e37a5471a9
Choose a head ref
Showing with 335 additions and 25 deletions.
  1. +2 −2 framework-profile.yaml
  2. +10 −3 overlay/files/system/oem/{08_boot_assessment.yaml → 08_grub.yaml}
  3. +0 −18 overlay/files/system/oem/21_grub.yaml
  4. +52 −2 profile-build/go.mod
  5. +271 −0 profile-build/go.sum
4 changes: 2 additions & 2 deletions framework-profile.yaml
Original file line number Diff line number Diff line change
@@ -96,9 +96,9 @@ repositories:
priority: 2
urls:
- "quay.io/kairos/packages"
reference: 20230512113938-repository.yaml
reference: 20230518142438-repository.yaml
- !!merge <<: *kairos
arch: arm64
urls:
- "quay.io/kairos/packages-arm64"
reference: 20230512115044-repository.yaml
reference: 20230518141920-repository.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
# - If we get back again at the GRUB menu, a failure must have occurred and we select the fallback entry, creating also
# sentinels files and a specific cmdline option indicating we failed booting after an upgrade

name: "Boot assessment"
name: "Boot assessment and branding"
stages:
boot.before:
# Remove any grub sentinel and add
@@ -40,6 +40,7 @@ stages:
group: 0
after-install:
# After install, reset, and upgrade, we install additional GRUB configuration for boot assessment into COS_STATE.
# We also add any branding that exists

- &statemount
name: "Mount state"
@@ -97,11 +98,15 @@ stages:
fi
fi
fi
- &grubinstall
name: "Grub branding"
if: '[ -e "/etc/kairos/branding/grubmenu.cfg" ]'
commands:
- cp -rfv /etc/kairos/branding/grubmenu.cfg /tmp/mnt/STATE/grubmenu
- &stateumount
name: "umount state"
commands:
- |
umount /tmp/mnt/STATE
- umount /tmp/mnt/STATE

# Here we do enable boot assessment for the next bootup.
# Similarly, we could trigger boot assessment in other cases
@@ -113,12 +118,14 @@ stages:
grub2-editenv /tmp/mnt/STATE/boot_assessment set enable_boot_assessment=yes
# We do re-install hooks here if needed to track upgrades of boot assessment
- <<: *customhook
- <<: *grubinstall
- <<: *bootgrub
- <<: *stateumount

after-reset:
- <<: *statemount
# Reset completely restores COS_STATE, so we re-inject ourselves
- <<: *customhook
- <<: *grubinstall
- <<: *bootgrub
- <<: *stateumount
18 changes: 0 additions & 18 deletions overlay/files/system/oem/21_grub.yaml

This file was deleted.

54 changes: 52 additions & 2 deletions profile-build/go.mod
Original file line number Diff line number Diff line change
@@ -3,15 +3,65 @@ module main
go 1.20

require (
github.com/kairos-io/kairos-sdk v0.0.1
github.com/kairos-io/kairos-sdk v0.0.3
github.com/urfave/cli v1.22.13
)

require (
atomicgo.dev/cursor v0.1.1 // indirect
atomicgo.dev/keyboard v0.2.9 // indirect
atomicgo.dev/schedule v0.0.2 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/hcsshim v0.10.0-rc.8 // indirect
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/containerd/containerd v1.7.1 // indirect
github.com/containerd/continuity v0.3.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/denisbrodbeck/machineid v1.0.1 // indirect
github.com/docker/cli v23.0.5+incompatible // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker v23.0.5+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-containerregistry v0.15.2 // indirect
github.com/gookit/color v1.5.3 // indirect
github.com/joho/godotenv v1.5.1 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/lithammer/fuzzysearch v1.1.7 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pterm/pterm v0.12.61 // indirect
github.com/qeesung/image2ascii v1.0.1 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
golang.org/x/sys v0.6.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/vbatts/tar-split v0.11.3 // indirect
github.com/wayneashleyberry/terminal-dimensions v1.1.0 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/tools v0.9.1 // indirect
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
google.golang.org/grpc v1.53.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading