1
0
mirror of https://github.com/containers/bootc.git synced 2026-02-05 06:45:13 +01:00
Commit Graph

3638 Commits

Author SHA1 Message Date
Colin Walters
a5f9790d89 Merge pull request #1585 from bootc-dev/release-1.8.0
Release 1.8.0
v1.8.0
2025-09-04 20:53:19 -04:00
bootc-bot[bot]
e04d5c41af Release 1.8.0
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-09-04 21:31:00 +00:00
Colin Walters
a0924212e5 Merge pull request #1584 from cgwalters/bump-proxy
Bump containers-image-proxy, ocidir, oci-spec and composefs-rs
2025-09-04 17:15:35 -04:00
Colin Walters
064acf2141 Bump containers-image-proxy, ocidir, oci-spec and composefs-rs
The first three are all entangled because of a messy oci-spec
semver incompatibility
https://github.com/youki-dev/oci-spec-rs/pull/288

Bumping composefs-rs is just to avoid having two versions
of the proxy in the lockfile.

Closes: https://github.com/bootc-dev/bootc/issues/1567

Signed-off-by: Colin Walters <walters@verbum.org>
2025-09-04 16:33:01 -04:00
Colin Walters
276018f75d Merge pull request #1578 from ckyrouac/xattr-bug
tar: Create a new xattrs file for each checksum
2025-09-04 09:50:35 -04:00
Colin Walters
11f2d30a9e Merge pull request #1485 from Johan-Liebert1/etc-merge
Implementation for /etc merge
2025-09-04 08:35:12 -04:00
Colin Walters
310f9f59e6 Merge pull request #1581 from jeckersb/cfs-no-storage
cfs: only get sysroot storage when repo is not supplied
2025-09-03 15:55:48 -04:00
ckyrouac
0e9fd6b010 tar: Create a new xattrs file for each checksum
This removes the code from export that links duplicate xattrs to
a single xattrs file. This is to avoid creating too many (over 65,000)
hardlinks to a single file. This might cause some image sizes to
increase, however compression should limit the size increase.

This is accomplished by creating the file-xattrs-link file directly,
instead of creating it as a link. This is to support backwards
compatibility in import.rs

Assisted-by: Claude Code
Signed-off-by: ckyrouac <ckyrouac@redhat.com>
2025-09-03 15:51:04 -04:00
John Eckersberg
6bc63a12f0 cfs: only get sysroot storage when repo is not supplied
For image building, we want to be able to run this on a non-bootc host
or in a container.  There we'll manipulate the composefs repo in a
provided tempdir.

Signed-off-by: John Eckersberg <jeckersb@redhat.com>
2025-09-03 14:57:39 -04:00
Colin Walters
6a060857b2 Merge pull request #1580 from cgwalters/unhide-soft
Un-hide soft-reboot
2025-09-03 13:04:58 -04:00
Colin Walters
849a634152 Un-hide soft-reboot
We debugged https://github.com/ostreedev/ostree/issues/3503 and
it's basically a systemd/Anaconda bug. So we can consider
soft reboots an available feature from our end (as systemd
does), but certainly one that will require integration testing on
the OS/distro side.

If you're building a system and you don't want to enable
soft reboots, just `rm /usr/lib/systemd/system/soft-reboot.target`
or so should do the trick.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-09-03 11:22:34 -04:00
John Eckersberg
fbd06e858b Merge pull request #1579 from cgwalters/srb-main
Deduplicate main error printing
2025-09-02 19:37:18 -04:00
Colin Walters
4fb177c33e Deduplicate main error printing
As part of the tracing-subscriber CVE I did a quick audit
for usages of `tracing::error!` and I noticed when
we updated the `main()` function in the primary
crate we missed also doing the same for system-reinstall-bootc.

Move the handling of that to utils.

xref: https://bugzilla.redhat.com/show_bug.cgi?id=2392017
Signed-off-by: Colin Walters <walters@verbum.org>
2025-09-02 18:37:43 -04:00
John Eckersberg
5be02611c8 Merge pull request #1577 from jeckersb/storage-relative-path
Makefile: Create storage symlink as relative
2025-09-02 17:15:04 -04:00
John Eckersberg
5d49775ca3 Makefile: Create storage symlink as relative
Resolves: #1575
Signed-off-by: John Eckersberg <jeckersb@redhat.com>
2025-09-02 16:30:12 -04:00
bootc-actions-token[bot]
df2da1adaf fix(deps): update auto merged updates (#1566)
Signed-off-by: Platform Engineering Bot <platform-engineering@redhat.com>
Co-authored-by: bootc-actions-token[bot] <225049296+bootc-actions-token[bot]@users.noreply.github.com>
2025-08-30 18:00:50 +00:00
Colin Walters
64fcb08000 Merge pull request #1522 from gursewak1997/bootc-1479
Add systemd structured logging for bootc state changes
2025-08-29 16:15:04 -04:00
gursewak1997
bf74ecbcc3 Add systemd structured logging for bootc state changes 2025-08-29 12:33:18 -07:00
John Eckersberg
6bb4c71331 Merge pull request #1555 from jeckersb/untest-require_value
kernel_cmdline: remove `cfg(test)` for `require_value_*` methods
2025-08-29 12:44:36 -04:00
John Eckersberg
04860d513a kernel_cmdline: remove cfg(test) for require_value_* methods
This appears to have been accidentally added somewhere along the way,
and I would like to use these in composefs-boot.

Also fixes duplicate docstring copy/paste error on
`require_value_of_utf8`.

Signed-off-by: John Eckersberg <jeckersb@redhat.com>
2025-08-29 11:09:17 -04:00
Colin Walters
1c552d8ccd Merge pull request #1561 from Johan-Liebert1/composefs-initramfs-lib
initramfs: Convert to library
2025-08-29 07:29:32 -04:00
Johan-Liebert1
b636b43c47 initramfs: Convert to library
Create a lib.rs as we'd like to utilize these functions elsewhere in the
codebase

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>
2025-08-29 15:52:30 +05:30
Pragyan Poudyal
7434b0fb0c Merge pull request #1556 from Johan-Liebert1/composefs-initramfs-error-handling
initramfs: Better error handling
2025-08-29 11:13:51 +05:30
Johan-Liebert1
ccc558c776 etc-merge: Refactor and fix dir perms while merging
While merging, existing directory in new_etc was being recursively
deleted which is not correct as any new files might also be deleted.

Instead, we simply create a directory if it doesn't exists, or if it
does exists, we update its metadata accordingly.

Add some test cases for the above.

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

cli: Add internal opt for printing etc-diff

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

etc-merge: Add license to Cargo.toml

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

etc-merge: More refactoring

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>
2025-08-28 19:01:28 +05:30
Colin Walters
70c80c675c Merge pull request #1557 from Johan-Liebert1/bump-composefs
Bump composefs-rs
2025-08-28 08:54:13 -04:00
Johan-Liebert1
5cbc0be7a6 initramfs: Bind mount /etc
This is prep work for eventual integration with composefs-native backend

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>
2025-08-28 17:53:57 +05:30
Johan-Liebert1
50722fa3d3 initramfs: Better error handling
Add error contexts to functions. Create wrappers around intrenal
functions with error context added

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>
2025-08-28 17:53:31 +05:30
Johan-Liebert1
fbf25c4dad Bump composefs-rs 2025-08-28 15:11:31 +05:30
Johan-Liebert1
dff69a996b etc-merge: Implement merge
Merge added, modified, removed files from the current etc into the new
etc directory, following the rules

1. If file is removed from current_etc, it will be removed from new_etc
2. If file is modified in current_etc, it will be copied to the new_etc
   overwriting any existing files
3. If a file is added in current_etc, then the above modification rule
   applies

Modification includes change in content/permissions. Changed in Xattrs
and/or ownership is not handled yet.

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

etc-merge: Handle ownership changes

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

etc-merge: Handle xattrs

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

etc-merge: Ignore mtime while comparing stat

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

Remove chown test

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

etc-merge: Use `llistxattr` and `lgetxattr`

Use the non symlink following counterparts for getting xattrs. Document
public functions and structures

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>
2025-08-28 09:45:36 +05:30
Johan-Liebert1
b2d5fc4202 Implementaion for /etc merge
Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

etc-merge: Incremental hash computation + test verity

Test for whether the file has fs-verity enabled or not, and if it does
we simply check the verity.

Incrementally compute hash for files rather than reading the entire file
in memory.

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

etc-merge: Use generic-tree from composefs-rs

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

Get removed files by traversing

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>
2025-08-28 09:45:35 +05:30
Colin Walters
a48dad7b50 Merge pull request #1554 from jeckersb/kernel-cmdline-crate
Move kernel cmdline parsing to dedicated crate
2025-08-27 14:26:03 -04:00
John Eckersberg
26a51a6ce2 Move kernel cmdline parsing to dedicated crate
Creates a new dedicated crate for kernel command line parsing functionality,
moving it out of bootc-lib for better separation of concerns and modularity.

Changes:
- Create new bootc-kernel-cmdline crate under crates/kernel_cmdline/
- Move kernel_cmdline.rs from bootc-lib to the new crate as lib.rs
- Add bootc-kernel-cmdline dependency to bootc-lib
- Update imports in bootc-lib to use bootc_kernel_cmdline:: namespace
- Add missing Debug derive and documentation to fix lints

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: John Eckersberg <jeckersb@redhat.com>
2025-08-26 13:30:44 -04:00
Colin Walters
1dd55c2ea4 Merge pull request #1550 from Johan-Liebert1/composefs-initramfs
Move composefs setup root to bootc initramfs
2025-08-26 11:10:52 -04:00
John Eckersberg
694e0ab5c5 Merge pull request #1552 from cgwalters/more-clippy
More clippy
2025-08-26 11:06:00 -04:00
Colin Walters
c23c9ae54c Fix (or allow) remaining clippy lints
Assisted-by: Claude Code
Signed-off-by: Colin Walters <walters@verbum.org>
2025-08-26 10:13:10 -04:00
Colin Walters
9bc7fe9d69 Fix use of str::len and deny in make validate-rust
Part of re-enabling clippy.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-08-26 09:53:30 -04:00
John Eckersberg
ea360d6d09 Merge pull request #1551 from cgwalters/various-clippy
crates/*: Fix most clippy lints
2025-08-26 09:39:26 -04:00
Johan-Liebert1
0ef1eca803 Move composefs setup root to bootc initramfs
Move the composefs-setup-root code from composefs-rs to bootc-initramfs
crate

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>
2025-08-26 19:00:59 +05:30
Colin Walters
adab6b0cc4 crates/lib: Fix various clippy lints
Signed-off-by: Colin Walters <walters@verbum.org>
2025-08-26 08:37:49 -04:00
Colin Walters
d028fc80b6 crates/test-integration: Fix clippy lints
Signed-off-by: Colin Walters <walters@verbum.org>
2025-08-26 08:24:08 -04:00
Colin Walters
c681354563 crates/xtask: Fix various clippy lints
Signed-off-by: Colin Walters <walters@verbum.org>
2025-08-26 08:24:08 -04:00
Colin Walters
56ed02d8ee crates/system-reinstall-bootc: Fix various clippy lints
Signed-off-by: Colin Walters <walters@verbum.org>
2025-08-26 08:24:08 -04:00
Colin Walters
a3fe7b2abc crates/blockdev: Fix various clippy lints
Signed-off-by: Colin Walters <walters@verbum.org>
2025-08-26 08:24:06 -04:00
Colin Walters
bb8444dfe6 crates/tmpfiles: Fix various clippy lints
Signed-off-by: Colin Walters <walters@verbum.org>
2025-08-26 08:24:04 -04:00
Colin Walters
950a03e09f crates/sysusers: Fix various clippy lints
Signed-off-by: Colin Walters <walters@verbum.org>
2025-08-26 08:24:02 -04:00
Colin Walters
3ee4479d22 crates/utils: Fix clippy lints
Signed-off-by: Colin Walters <walters@verbum.org>
2025-08-26 08:24:02 -04:00
Colin Walters
5e830a85c8 ostree-ext: Fix clippy lints
Signed-off-by: Colin Walters <walters@verbum.org>
2025-08-26 08:24:02 -04:00
Colin Walters
d368ea8bc8 Merge pull request #1549 from bootc-dev/release-1.7.1
Release 1.7.1
v1.7.1
2025-08-26 07:24:45 -04:00
bootc-actions-token[bot]
5e687f7472 Release 1.7.1
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-08-25 21:55:55 +00:00
Colin Walters
0ebd518272 Merge pull request #1547 from cgwalters/workaround-buildinfo
build-sys: Work around #1546
2025-08-25 17:23:24 -04:00