Merge bootupd #874

cgwalters · 2024-11-05T20:41:29Z

Rationale:

bootupd hasn't really seen usage outside of the ostree sphere, and maintaining it as its own independent thing has huge overhead (e.g. constant dependabot things, CI maintenance, releases)
bootc currently depends on it and the above overhead is also reflected onto people who want to ship bootc as they need to package bootupd too
Working on distribution/OS independence makes sense here

- Show what `bootcurrent` is - Add the process exit status

To aid debugging.

This fixes compatibility with current c9s `findmnt`, which otherwise errors out with `findmnt: ACTION column is requested, but --poll is not enabled`

two minor patches + c9s compat

Bumps [libc](https://github.com/rust-lang/libc) from 0.2.150 to 0.2.151. - [Release notes](https://github.com/rust-lang/libc/releases) - [Commits](rust-lang/libc@0.2.150...0.2.151) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.60 to 0.10.61. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](sfackler/rust-openssl@openssl-v0.10.60...openssl-v0.10.61) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

We add the GRUB2DIR creation in ece9120 but there is an earlier use of that directory if there are dropins so let's move the creation of the directory earlier before the dropins are processed. I hit this because I'm testing out things on FCOS. Building a qemu and metal image works just fine, because in that case we are doing the MBR install using `grub2-install` and I guess that tool creates the directory. In the metal4k case, though, there is no BIOS install and thus we get here and the GRUB2DIR doesn't exist and bootupd fails.

grubconfigs: move the GRUB2DIR creation earlier

…l-0.10.61 build(deps): bump openssl from 0.10.60 to 0.10.61

….2.151 build(deps): bump libc from 0.2.150 to 0.2.151

Release 0.2.16

In osbuild/osbuild#1475 we are updating aleph version to have more information and some of the fields are changing slightly. Notably here `imgid` is no longer going to be populated and `build` -> `version` now. Let's make these tweaks and also just drop any fields from the definition here that we aren't using to tolerate changes better.

Once osbuild/osbuild#1475 gets picked up and starts getting used the .coreos-aleph-version.json will be a symlink. Let's canonicalize and find the actual file before dropping into sysroot.open_file_optional() because the underlying code for that uses O_NOFOLLOW and will give an ELOOP (too many symbolic links) error.

This makes it amenable to unit testing, and also since the previous code was always operating on `/` there's no good reason to use the `openat` APIs which don't follow symlinks by default, which breaks ergonomics.

…-updates coreos: update aleph version handling

Dependabot isn't keeping up.

Release 0.2.17

Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.75 to 1.0.76. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](dtolnay/anyhow@1.0.75...1.0.76) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.61 to 0.10.62. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](sfackler/rust-openssl@openssl-v0.10.61...openssl-v0.10.62) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…-1.0.76 build(deps): bump anyhow from 1.0.75 to 1.0.76

…l-0.10.62 build(deps): bump openssl from 0.10.61 to 0.10.62

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.8.1 to 3.9.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](Stebalien/tempfile@v3.8.1...v3.9.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.76 to 1.0.78. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](dtolnay/anyhow@1.0.76...1.0.78) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.108 to 1.0.109. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](serde-rs/json@v1.0.108...v1.0.109) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…json-1.0.109 build(deps): bump serde_json from 1.0.108 to 1.0.109

…-1.0.78 build(deps): bump anyhow from 1.0.76 to 1.0.78

…le-3.9.0 build(deps): bump tempfile from 3.8.1 to 3.9.0

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.193 to 1.0.195. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](serde-rs/serde@v1.0.193...v1.0.195) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…d-ext-4.0.3 build(deps): bump cap-std-ext from 4.0.2 to 4.0.3

Bumps [clap](https://github.com/clap-rs/clap) from 4.5.19 to 4.5.20. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](clap-rs/clap@clap_complete-v4.5.19...clap_complete-v4.5.20) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

….5.20 build(deps): bump clap from 4.5.19 to 4.5.20

- grub.cfg was removed from the main branch in coreos/coreos-assembler#3900 - Updated the link to maintain reference to the file’s origin and history. Signed-off-by: Renata Ravanelli <[email protected]>

grub-static-pre.cfg: Update link to preserve coreos-assembler history

See uraimo/run-on-arch-action#155

ci: update `uraimo/run-on-arch-action` to v2 latest version

Bumps [regex](https://github.com/rust-lang/regex) from 1.11.0 to 1.11.1. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](rust-lang/regex@1.11.0...1.11.1) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.89 to 1.0.91. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](dtolnay/anyhow@1.0.89...1.0.91) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…1.11.1 build(deps): bump regex from 1.11.0 to 1.11.1

Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.37 to 0.38.38. - [Release notes](https://github.com/bytecodealliance/rustix/releases) - [Changelog](https://github.com/bytecodealliance/rustix/blob/main/CHANGELOG.md) - [Commits](bytecodealliance/rustix@v0.38.37...v0.38.38) --- updated-dependencies: - dependency-name: rustix dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.128 to 1.0.132. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](serde-rs/json@1.0.128...1.0.132) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.66 to 0.10.68. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](sfackler/rust-openssl@openssl-v0.10.66...openssl-v0.10.68) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…-1.0.91 build(deps): bump anyhow from 1.0.89 to 1.0.91

…json-1.0.132 build(deps): bump serde_json from 1.0.128 to 1.0.132

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.210 to 1.0.213. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](serde-rs/serde@v1.0.210...v1.0.213) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…1.0.213 build(deps): bump serde from 1.0.210 to 1.0.213

…l-0.10.68 build(deps): bump openssl from 0.10.66 to 0.10.68

…-0.38.38 build(deps): bump rustix from 0.38.37 to 0.38.38

This executes on coreos/bootupd#432 Basically, bootupd doesn't have any users outside of the rpm-ostree/bootc ecosystem and carrying a separate project adds huge amounts of logistical overhead.

- Enable building the code as part of our workspace - Switch over some dependencies to be workspace deps - Change our bootloader invocation to call into this code TODO: - Expose bootupd state as part of status - Add option to take over the binaries Signed-off-by: Colin Walters <[email protected]>

Conan-Kudo · 2024-11-16T21:43:57Z

bootupd hasn't really seen usage outside of the ostree sphere, and maintaining it as its own independent thing has huge overhead (e.g. constant dependabot things, CI maintenance, releases)

Doing this will preclude any consideration for adoption outside of Atomic Fedora. I had been talking to @travier about doing this for regular Fedora sometime in the next year or so, but if it's merged inside of bootc, I will abandon interest in that.

cgwalters · 2024-11-19T16:11:44Z

Closing for now as there is an offer to help maintain bootupd separately.

cgwalters and others added 30 commits December 7, 2023 16:26

efi: Add more debugging for efibootmgr invocation

aabe3cc

- Show what `bootcurrent` is - Add the process exit status

filesystem: Copy stderr on failure

157acb2

To aid debugging.

filesystem: Only capture needed columns

1457c20

This fixes compatibility with current c9s `findmnt`, which otherwise errors out with `findmnt: ACTION column is requested, but --poll is not enabled`

Merge pull request containers#579 from cgwalters/misc

4e2eb8a

two minor patches + c9s compat

Merge pull request containers#583 from dustymabe/dusty-grubconfigs

a5388f6

grubconfigs: move the GRUB2DIR creation earlier

Merge pull request containers#581 from coreos/dependabot/cargo/openss…

37c758e

…l-0.10.61 build(deps): bump openssl from 0.10.60 to 0.10.61

Merge pull request containers#580 from coreos/dependabot/cargo/libc-0…

b89b6c5

….2.151 build(deps): bump libc from 0.2.150 to 0.2.151

Release 0.2.16

9e61ce9

Merge pull request containers#584 from jmarrero/dot16

055de7d

Release 0.2.16

coreos: Change aleph API to take a root as a std path

8d746cd

This makes it amenable to unit testing, and also since the previous code was always operating on `/` there's no good reason to use the `openat` APIs which don't follow symlinks by default, which breaks ergonomics.

Merge pull request containers#585 from dustymabe/dusty-aleph-versiono…

c1bf5e7

…-updates coreos: update aleph version handling

Cargo.lock: Update *

c0515c6

Dependabot isn't keeping up.

Release 0.2.17

90a85ec

Merge pull request containers#587 from cgwalters/release

be99220

Release 0.2.17

Merge pull request containers#588 from coreos/dependabot/cargo/anyhow…

d23d5c3

…-1.0.76 build(deps): bump anyhow from 1.0.75 to 1.0.76

Merge pull request containers#589 from coreos/dependabot/cargo/openss…

883d2d8

…l-0.10.62 build(deps): bump openssl from 0.10.61 to 0.10.62

Merge pull request containers#593 from coreos/dependabot/cargo/serde_…

a1471f0

…json-1.0.109 build(deps): bump serde_json from 1.0.108 to 1.0.109

Merge pull request containers#592 from coreos/dependabot/cargo/anyhow…

e63b2d2

…-1.0.78 build(deps): bump anyhow from 1.0.76 to 1.0.78

Merge pull request containers#591 from coreos/dependabot/cargo/tempfi…

fd3566b

…le-3.9.0 build(deps): bump tempfile from 3.8.1 to 3.9.0

HuijingHei and others added 20 commits October 15, 2024 16:51

Merge pull request containers#744 from coreos/dependabot/cargo/cap-st…

2d7d9cc

…d-ext-4.0.3 build(deps): bump cap-std-ext from 4.0.2 to 4.0.3

Merge pull request containers#745 from coreos/dependabot/cargo/clap-4…

3a0f263

….5.20 build(deps): bump clap from 4.5.19 to 4.5.20

grub-static-pre.cfg: Update link to preserve coreos-assembler history

94bee2e

- grub.cfg was removed from the main branch in coreos/coreos-assembler#3900 - Updated the link to maintain reference to the file’s origin and history. Signed-off-by: Renata Ravanelli <[email protected]>

Merge pull request containers#747 from ravanelli/pr/grub_link

5cb234a

grub-static-pre.cfg: Update link to preserve coreos-assembler history

ci: update uraimo/run-on-arch-action to v2.8.1

caa344c

See uraimo/run-on-arch-action#155

Merge pull request containers#758 from HuijingHei/ci-multi-arch

bb14e02

ci: update `uraimo/run-on-arch-action` to v2 latest version

Merge pull request containers#756 from coreos/dependabot/cargo/regex-…

942526b

…1.11.1 build(deps): bump regex from 1.11.0 to 1.11.1

Merge pull request containers#753 from coreos/dependabot/cargo/anyhow…

d46c7f2

…-1.0.91 build(deps): bump anyhow from 1.0.89 to 1.0.91

Merge pull request containers#752 from coreos/dependabot/cargo/serde_…

c45214c

…json-1.0.132 build(deps): bump serde_json from 1.0.128 to 1.0.132

Merge pull request containers#755 from coreos/dependabot/cargo/serde-…

7d42082

…1.0.213 build(deps): bump serde from 1.0.210 to 1.0.213

Merge pull request containers#751 from coreos/dependabot/cargo/openss…

38966fb

…l-0.10.68 build(deps): bump openssl from 0.10.66 to 0.10.68

Merge pull request containers#754 from coreos/dependabot/cargo/rustix…

0aedf55

…-0.38.38 build(deps): bump rustix from 0.38.37 to 0.38.38

Merge remote-tracking branch 'bootupd/main' into merge-bootupd

57d008a

This executes on coreos/bootupd#432 Basically, bootupd doesn't have any users outside of the rpm-ostree/bootc ecosystem and carrying a separate project adds huge amounts of logistical overhead.

openshift-ci bot added the do-not-merge/work-in-progress label Nov 5, 2024

cgwalters mentioned this pull request Nov 5, 2024

consider folding into github.com/containers/bootc coreos/bootupd#432

Open

cgwalters force-pushed the merge-bootupd branch from 49cca40 to 8c5a10a Compare November 5, 2024 22:23

cgwalters force-pushed the merge-bootupd branch from 8c5a10a to ac98778 Compare November 5, 2024 22:24

This was referenced Nov 6, 2024

bootupd integration #456

Open

Raspberry Pi is unsupported due to GPT-only partition table osbuild/bootc-image-builder#701

Open

cgwalters closed this Nov 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge bootupd #874

Merge bootupd #874

cgwalters commented Nov 5, 2024 •

edited

Loading

Conan-Kudo commented Nov 16, 2024 •

edited

Loading

cgwalters commented Nov 19, 2024

Merge bootupd #874

Merge bootupd #874

Conversation

cgwalters commented Nov 5, 2024 • edited Loading

Conan-Kudo commented Nov 16, 2024 • edited Loading

cgwalters commented Nov 19, 2024

cgwalters commented Nov 5, 2024 •

edited

Loading

Conan-Kudo commented Nov 16, 2024 •

edited

Loading