Commit Graph

6635 Commits

Author SHA1 Message Date
Colin Walters
97d83e6225 configure: post-release version bump 2023-08-24 21:18:02 -04:00
Colin Walters
dab8051fd8 Release 2023.6 2023-08-24 21:18:02 -04:00
Joseph Marrero Corchado
bd91fda636
Merge pull request #3010 from cgwalters/more-composefs-fixes
build-sys: Really fix composefs check
2023-08-24 21:13:07 -04:00
Colin Walters
3648c5ae29 build-sys: Really fix composefs check
The ordering of the includes apparently matters...and I didn't
actually check that the previous change enables composefs on c9s.
But I did now.  For reals.

While we have the patient open, I switched to `AC_LANG_PROGRAM`
because I originally thought the bug had something to do with that.
As far as I understand, more cleanly separating the includes
from the injected body text is a useful thing in `AC_LANG_PROGRAM`.
2023-08-24 19:58:20 -04:00
Colin Walters
db3b286d6b
Merge pull request #3009 from cgwalters/c9s-ci
C9s CI && composefs build detection fix
2023-08-24 19:38:22 -04:00
Joseph Marrero Corchado
bcd4d02606
Merge pull request #3007 from cgwalters/optin-new-bootloader-naming
deploy: Add bootloader-naming-2 opt-in
2023-08-24 18:01:26 -04:00
Colin Walters
33ef4ae620 build-sys: Look for both linux/mount.h and sys/mount.h
Since that's what composefs uses.
2023-08-24 17:25:14 -04:00
Colin Walters
bd8339bda2 ci: Add c9s build
Since it's an active target of this project.
2023-08-24 17:24:07 -04:00
Colin Walters
cbe36c3a35
Merge pull request #3008 from ostreedev/maybe_ostree
prepare-root: If composefs is configured as "maybe" don't fail
2023-08-24 11:45:22 -04:00
Eric Curtin
29423a893c prepare-root: If composefs is configured as "maybe" don't fail
If composefs is configured as "maybe", we should continue even if
composefs support is not built in.
2023-08-24 15:20:25 +01:00
Colin Walters
02d419079d deploy: Add bootloader-naming-2 opt-init
I've verified that this fixes compatibility with GRUB, which
parses the filename:
https://github.com/ostreedev/ostree/issues/2961

However, out of a large degree of conservatism I've made this
an opt-in behavior for now.

My plan is to test it out in the FCOS development streams first.
2023-08-24 09:40:54 -04:00
Eric Curtin
fb06d59e75
Merge pull request #3003 from cgwalters/prepare-root-oscore-and-units
Move prepare-root karg helpers into otcore, add unit tests
2023-08-24 09:59:46 +01:00
Colin Walters
20b8cb174c Move prepare-root karg helpers into otcore, add unit tests
Add long overdue unit testing coverage for this, which
at least slightly closes out the android boot CI gap.

Actually, this *copies* the karg parsing code into otcore because
it now uses glib, which we're not yet using in the static
prepare-root.  It's pretty tempting to drop support for the
static prepare root entirely.  But for now we'll live with some
code duplication.
2023-08-23 17:11:10 -04:00
Joseph Marrero Corchado
4451949213
Merge pull request #2997 from cgwalters/test-cleanups-1
tests/destructive: Port more to xshell
2023-08-23 10:38:16 -04:00
Joseph Marrero Corchado
37f247da02
Merge pull request #2999 from cgwalters/add-oscore-units
tests: Add otcore unit tests
2023-08-23 10:37:48 -04:00
Eric Curtin
aa8ad204d5
Merge pull request #3001 from cgwalters/misc-c99-style-4
Misc c99 style 4
2023-08-23 00:06:14 +01:00
Colin Walters
75a43deb30 cmd/grub2-generate: Port to C99 style
Just keeping up momentum.
2023-08-22 17:51:33 -04:00
Colin Walters
767ca134b5 cmd/init: Port to C99 style
Just keeping up momentum.
2023-08-22 17:49:28 -04:00
Joseph Marrero Corchado
e3ef72ea8a
Merge pull request #3000 from cgwalters/test-inst-update
tests/inst: Update to latest ostree-ext
2023-08-22 16:56:46 -04:00
Colin Walters
6eeb8b5623
Merge pull request #2995 from ostreedev/dependabot/submodules/composefs-1aed878
build(deps): bump composefs from `a6e827d` to `1aed878`
2023-08-22 16:41:00 -04:00
Eric Curtin
e751dd9a7b
Merge pull request #2998 from cgwalters/disable-composefs-too-old
build-sys: Disable composefs on too-old Linux headers
2023-08-22 20:08:26 +01:00
Colin Walters
facb9a1a60 tests/inst: Update to latest ostree-ext
(And glib, etc.)
2023-08-22 14:23:56 -04:00
Colin Walters
7c82340d08
Merge pull request #2975 from ostreedev/androidboot-single-slot-mode
prepare-root: On a non-A/B androidboot system, boot system slot a
2023-08-22 14:11:50 -04:00
Colin Walters
e3f0c4d49c tests: Add otcore unit tests
This just stubs out the basic infrastructure, to be expanded upon.
2023-08-22 13:04:46 -04:00
Colin Walters
90e54619df build-sys: Disable composefs on too-old Linux headers
This should fix the build with Google OSS-fuzz which currently
uses an old Ubuntu.
2023-08-22 12:48:06 -04:00
Eric Curtin
6e9e50d87c prepare-root: Changes made to find_proc_cmdline_key
Used strspn based on feedback from similar function.
2023-08-22 16:43:20 +01:00
Eric Curtin
650a053795 prepare-root: On a non-A/B androidboot system, boot system slot a
Sometimes android bootloaders boot in a nonab way:

  https://source.android.com/docs/core/ota/nonab

In this case, "androidboot." kargs are present but not
"androidboot.slot_suffix" specifically.

In this case, rather than getting stuck in a partially booted
environment, boot system slot a.
2023-08-22 16:43:20 +01:00
Eric Curtin
16b97d8a40
Merge pull request #2996 from cgwalters/misc-c99-style-3
cli/set-origin: Port to C99 style
2023-08-22 16:08:10 +01:00
Colin Walters
578c87e7ef tests/destructive: Port more to xshell
Just keeping up momentum.
2023-08-22 09:52:43 -04:00
Colin Walters
8f302f2a46 cli/set-origin: Port to C99 style
Just keeping up momentum.
2023-08-22 09:44:39 -04:00
dependabot[bot]
69d7d837be
build(deps): bump composefs from a6e827d to 1aed878
Bumps [composefs](https://github.com/containers/composefs) from `a6e827d` to `1aed878`.
- [Release notes](https://github.com/containers/composefs/releases)
- [Commits](a6e827df2d...1aed8781d6)

---
updated-dependencies:
- dependency-name: composefs
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-22 12:59:46 +00:00
Eric Curtin
ee1e585ee9
Merge pull request #2993 from cgwalters/misc-c99-style-2
Misc c99 style 2
2023-08-18 22:12:24 +01:00
Colin Walters
22b47781fb checkout: Port to C99 style
Just keeping up momentum.
2023-08-18 15:39:45 -04:00
Colin Walters
f7786e759f
Merge pull request #2990 from cgwalters/init-is-stateroot
Two s/osname/stateroot/ patches
2023-08-18 08:49:31 -04:00
Colin Walters
27266f90d9 lzma: Port to C99 style
Just keeping up momentum.
2023-08-17 21:49:33 -04:00
Eric Curtin
722fc2d060
Merge pull request #2991 from cgwalters/misc-c99-style
Misc c99 style
2023-08-18 00:19:21 +01:00
Colin Walters
9f39f78e83 remote-add: Port to c99 style
- Drop `goto out`
- Use declare-and-initialize
2023-08-17 17:03:17 -04:00
Colin Walters
9036c96a04 admin: Port to c99 style
- Drop `goto out`
- Use declare-and-initialize
2023-08-17 16:59:41 -04:00
Colin Walters
f4e56b910f admin-deploy: Add --stateroot as alias for --os
To further help deprecate the confusing "osname" terminology.
2023-08-17 16:49:09 -04:00
Colin Walters
9d5ccfefff Add ostree admin stateroot-init as alias for os-init
To further help deprecate the confusing "osname" terminology.
2023-08-17 16:46:02 -04:00
Eric Curtin
9ac938c4ff
Merge pull request #2989 from cgwalters/lock-timeout-longer
repo: Bump lock timeout to 5 minutes
2023-08-17 14:38:30 +01:00
Colin Walters
f4b420492f
Merge pull request #2973 from ostreedev/dependabot/submodules/composefs-a6e827d
build(deps): bump composefs from `1704f82` to `a6e827d`
2023-08-17 09:36:20 -04:00
Colin Walters
e88ec69eef repo: Bump lock timeout to 5 minutes
And update the doc text to talk about having a timeout at all
by default being a mistake.

Timeouts are really best handled at a higher level; if two processes
are contending for the ostree lock and one is actually frozen,
resolving this is something an admin may want to handle and introspect/debug
instead of having the waiter error out.

Most people using ostree are doing it in a way in which they have
higher level timeouts (e.g. on a container pod).
2023-08-17 08:28:16 -04:00
Eric Curtin
55121cc4df
Merge pull request #2988 from cgwalters/prepare-root-binding-key
prepare-root: Minor clarifications
2023-08-16 23:20:15 +01:00
Eric Curtin
d648eea631
Merge pull request #2987 from cgwalters/prefix-stage-deploy
deploy: Add some error prefixing
2023-08-16 22:37:06 +01:00
Colin Walters
94cb37cb30 prepare-root: Minor clarifications
No functional changes.
2023-08-16 16:56:12 -04:00
Colin Walters
25a458b94b deploy: Add some error prefixing
We saw a bare
`Txn Rebase on <osname> failed: Failed to find kernel in /usr/lib/modules, /usr/lib/ostree-boot or /boot`
which isn't bad, but it'd be better to be a bit more specific.
2023-08-16 16:16:24 -04:00
Eric Curtin
8712a46756
Merge pull request #2985 from cgwalters/cleanup-proc-cmdline
switchroot,generator: Only read /proc/cmdline once
2023-08-16 19:31:35 +01:00
Colin Walters
083bad8cf2
Merge pull request #2984 from alexlarsson/prepare-root-no-raw-key
prepare-root: Only support base64 formated public key files
2023-08-16 09:05:39 -04:00
Colin Walters
28aed49d87 switchroot,generator: Only read /proc/cmdline once
Change the helper function to parse an existing cmdline instead
of potentially reading `/proc/cmdline` multiple times.
2023-08-16 09:05:19 -04:00