ostree.git
5 years agodocs: Fix various typos
Kelvin Fan [Thu, 15 Oct 2020 23:51:44 +0000 (19:51 -0400)]
docs: Fix various typos

5 years agoMerge pull request #2213 from alexlarsson/summary-bugfixes
OpenShift Merge Robot [Thu, 8 Oct 2020 19:18:34 +0000 (15:18 -0400)]
Merge pull request #2213 from alexlarsson/summary-bugfixes

Various fixes from the indexed-summaries branch

5 years agosignatures: Fix leak in _sign_detached_metadata_append()
Alexander Larsson [Wed, 16 Sep 2020 13:54:03 +0000 (15:54 +0200)]
signatures: Fix leak in _sign_detached_metadata_append()

This needs to ref_sink the returned variant, as it is used with g_autoptr
in the callers.

5 years agofetch_summary_with_options: Fix n-network-retries option parsing
Alexander Larsson [Wed, 16 Sep 2020 10:09:41 +0000 (12:09 +0200)]
fetch_summary_with_options: Fix n-network-retries option parsing

"&u" is not a valid gvariant format string, it should just be "u".

5 years agoostree_repo_find_remotes_async: Fix leak of summary
Alexander Larsson [Mon, 14 Sep 2020 11:52:10 +0000 (13:52 +0200)]
ostree_repo_find_remotes_async: Fix leak of summary

We were creating a GVariant from a GBytes and storing it in an
g_autoptr without ref_sinking it.

5 years agoMerge pull request #2212 from jlebon/pr/packit-tweak
OpenShift Merge Robot [Wed, 7 Oct 2020 19:34:22 +0000 (15:34 -0400)]
Merge pull request #2212 from jlebon/pr/packit-tweak

ci: Make Packit ignore downstream patches

5 years agoMerge pull request #2211 from jlebon/pr/close-fd
OpenShift Merge Robot [Wed, 7 Oct 2020 19:23:43 +0000 (15:23 -0400)]
Merge pull request #2211 from jlebon/pr/close-fd

lib/deploy: Don't leak fd when checksumming dtbs

5 years agoci: Make Packit ignore downstream patches
Jonathan Lebon [Wed, 7 Oct 2020 19:04:17 +0000 (15:04 -0400)]
ci: Make Packit ignore downstream patches

We don't really carry "Fedora-only" patches in dist-git. So we want to
nuke all the patches which exist there.

Follow-up to #2210.

5 years agolib/deploy: Don't leak fd when checksumming dtbs
Jonathan Lebon [Wed, 7 Oct 2020 18:44:25 +0000 (14:44 -0400)]
lib/deploy: Don't leak fd when checksumming dtbs

Likely the root of https://bugzilla.redhat.com/show_bug.cgi?id=1886149.

5 years agoMerge pull request #2210 from jlebon/pr/packit
OpenShift Merge Robot [Wed, 7 Oct 2020 13:46:14 +0000 (09:46 -0400)]
Merge pull request #2210 from jlebon/pr/packit

Add Packit integration

5 years agoAdd Packit integration
Jonathan Lebon [Sat, 3 Oct 2020 15:23:49 +0000 (11:23 -0400)]
Add Packit integration

This is a basic `.packit.yaml` integration file which will allow us have
continuous builds of OSTree in cosa and upstream CI. If things go well,
we'll likely deploy this in other build tools like rpm-ostree.

Prompted by wanting to get #2155 out to unblock
https://github.com/coreos/rpm-ostree/pull/2170.

5 years agoMerge pull request #2198 from cgwalters/no-hardlink-zerosize
OpenShift Merge Robot [Mon, 5 Oct 2020 20:06:38 +0000 (22:06 +0200)]
Merge pull request #2198 from cgwalters/no-hardlink-zerosize

checkout: Don't hardlink zero sized files

5 years agoMerge pull request #2209 from travier/docs-fixup
OpenShift Merge Robot [Mon, 5 Oct 2020 19:50:00 +0000 (21:50 +0200)]
Merge pull request #2209 from travier/docs-fixup

docs: Fix URL in Jekyll _config.yml

5 years agodocs: Fix URL in Jekyll _config.yml
Timothée Ravier [Mon, 5 Oct 2020 19:10:31 +0000 (21:10 +0200)]
docs: Fix URL in Jekyll _config.yml

5 years agoMerge pull request #2208 from cgwalters/bump-libglnx
OpenShift Merge Robot [Mon, 5 Oct 2020 18:56:35 +0000 (20:56 +0200)]
Merge pull request #2208 from cgwalters/bump-libglnx

libglnx: Bump to master

5 years agoMerge pull request #2207 from travier/docs
OpenShift Merge Robot [Mon, 5 Oct 2020 18:19:29 +0000 (20:19 +0200)]
Merge pull request #2207 from travier/docs

docs: Add GitHub Pages support

5 years agolibglnx: Bump to master
Colin Walters [Mon, 5 Oct 2020 18:04:21 +0000 (14:04 -0400)]
libglnx: Bump to master

To pull in the fix for `/var/tmp` on NixOS but also
on general principle.

Update submodule: libglnx

```
Colin Walters (1):
      xattrs: Add better error prefixing

Rebecca Turner (2):
      glnx-fdio: try $TMPDIR if /var/tmp doesn't exist
      glnx-fdio: use $TMPDIR if set
```

5 years agoMerge pull request #2155 from jlebon/pr/add-initrds
OpenShift Merge Robot [Fri, 2 Oct 2020 20:41:01 +0000 (16:41 -0400)]
Merge pull request #2155 from jlebon/pr/add-initrds

lib/deploy: Add support for overlay initrds

5 years agoREADME: Update and mention new docs
Timothée Ravier [Fri, 2 Oct 2020 12:40:16 +0000 (14:40 +0200)]
README: Update and mention new docs

5 years agodocs: Move historical README to the docs
Timothée Ravier [Fri, 2 Oct 2020 12:38:20 +0000 (14:38 +0200)]
docs: Move historical README to the docs

5 years agodocs: Move and update pages from the manual
Timothée Ravier [Fri, 2 Oct 2020 12:34:33 +0000 (14:34 +0200)]
docs: Move and update pages from the manual

5 years agodocs: Update Contributing and tutorial pages
Timothée Ravier [Wed, 30 Sep 2020 17:22:29 +0000 (19:22 +0200)]
docs: Update Contributing and tutorial pages

5 years agocheckout: Don't hardlink zero sized files
Colin Walters [Wed, 16 Sep 2020 00:35:33 +0000 (00:35 +0000)]
checkout: Don't hardlink zero sized files

Alternative to https://github.com/ostreedev/ostree/pull/2197

Python's (usually) zero-sized `__init__.py` files can provoke
us hitting the hardlink limits on some filesystems (`EMLINK`).
At least one Fedora rpm-ostree user hit this.

The benefits of hardlinking here are quite marginal; lots
of hardlinks can behave suboptimally in particular filesystems
like BTRFS too.

This builds on prior code which made this an option, introduced
in https://github.com/ostreedev/ostree/commit/673cacd633f9d6b653cdea530657d3e780a41bbd
Now we just do it uncondtionally.

Also this provoked a different bug in a very obscure user mode checkout
case; when the "real" permissions were different from the "physical"
permissions, we would still hardlink.  Fix the test case for this.

5 years agoMerge pull request #2167 from pwithnall/2165-dont-download-config
OpenShift Merge Robot [Thu, 1 Oct 2020 20:46:29 +0000 (16:46 -0400)]
Merge pull request #2167 from pwithnall/2165-dont-download-config

Avoid need to download remote config when pulling

5 years agodocs: Update Index page
Timothée Ravier [Mon, 28 Sep 2020 15:02:45 +0000 (17:02 +0200)]
docs: Update Index page

5 years agodocs: Add Jekyll and theme config
Timothée Ravier [Mon, 28 Sep 2020 14:55:03 +0000 (16:55 +0200)]
docs: Add Jekyll and theme config

5 years agoostree/dump: Fix a memory leak
Philip Withnall [Mon, 10 Aug 2020 11:07:22 +0000 (12:07 +0100)]
ostree/dump: Fix a memory leak

Re-using the `refs` variable for the main list of refs, plus the
iterated lists, meant that the main list was never freed (although all
the iterated ones were freed correctly).

Fix this by using two variables rather than reusing the one.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
5 years agolib/pull: Read mode and tombstone options from summary file if possible
Philip Withnall [Mon, 10 Aug 2020 11:06:35 +0000 (12:06 +0100)]
lib/pull: Read mode and tombstone options from summary file if possible

Otherwise, fall back to downloading and reading them from the `config`
file. See the previous commit for details.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Fixes: #2165
5 years agolib/repo: Add mode and tombstone config options to the summary file
Philip Withnall [Mon, 10 Aug 2020 11:05:06 +0000 (12:05 +0100)]
lib/repo: Add mode and tombstone config options to the summary file

Currently, they are set in the `config` file and cause that to be
downloaded on every pull. Given that the client is already pulling the
`summary` file, it makes sense to avoid an additional network round trip
and cache those options in the `summary` file.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
Helps: #2165

5 years agolib/deploy: Add support for overlay initrds
Jonathan Lebon [Mon, 17 Aug 2020 13:48:18 +0000 (09:48 -0400)]
lib/deploy: Add support for overlay initrds

In FCOS and RHCOS, the need to configure software in the initramfs has
come up multiple times. Sometimes, using kernel arguments suffices.
Other times, it really must be a configuration file. Rebuilding the
initramfs on the client-side however is a costly operation. Not only
does it add complexity to the update workflow, it also erodes a lot of
the value obtained from using the baked "blessed" initramfs from the
tree itself.

One elegant way to address this is to allow specifying multiple
initramfses. This is supported by most bootloaders (notably GRUB) and
results in each initrd being overlayed on top of each other.

This patch allows libostree clients to leverage this so that they can
avoid regenerating the initramfs entirely. libostree itself is agnostic
as to what kind and how much data overlay initrds contain. It's up to
the clients to enforce such boundaries.

To implement this, we add a new ostree_sysroot_stage_overlay_initrd
which takes a file descriptor and returns a checksum. Then users can
pass these checksums when calling the deploy APIs via the new array
option `overlay_initrds`. We copy these files into `/boot` and add them
to the BLS as another `initrd` entry.

5 years agolib/deploy: Add deploy/stage APIs with options
Jonathan Lebon [Mon, 17 Aug 2020 13:48:17 +0000 (09:48 -0400)]
lib/deploy: Add deploy/stage APIs with options

And make the `override_kernel_argv` one of those options. This is mostly
a mechanical move here, no functional change otherwise.

Prep for adding a new option.

5 years agolib/bootconfig: Add support for multiple initrd keys
Jonathan Lebon [Mon, 17 Aug 2020 13:48:16 +0000 (09:48 -0400)]
lib/bootconfig: Add support for multiple initrd keys

Prep for actually teaching the rest of the codebase about this.

We keep the primary initrd in the `options` hash table for backwards
compatibility.

5 years agoMerge pull request #2204 from jlebon/pr/versioning-tweaks
OpenShift Merge Robot [Wed, 30 Sep 2020 17:22:49 +0000 (17:22 +0000)]
Merge pull request #2204 from jlebon/pr/versioning-tweaks

Various minor versioning related tweaks

5 years agolib: Minor versioning related fixes
Jonathan Lebon [Fri, 25 Sep 2020 19:01:09 +0000 (15:01 -0400)]
lib: Minor versioning related fixes

Fix/add the `Since` marker to the new static delta APIs, and update the
symbol versioning templates/comments.

5 years agoMakefile-libostree.am: Uncomment BUILDOPT_IS_DEVEL_BUILD conditional
Jonathan Lebon [Fri, 25 Sep 2020 18:59:45 +0000 (14:59 -0400)]
Makefile-libostree.am: Uncomment BUILDOPT_IS_DEVEL_BUILD conditional

We shouldn't have to toggle the conditional itself during release
builds. It should only evaluate to true during devel builds.

5 years agoMerge pull request #2203 from cgwalters/delta-sign-cleanups
OpenShift Merge Robot [Fri, 25 Sep 2020 13:57:33 +0000 (13:57 +0000)]
Merge pull request #2203 from cgwalters/delta-sign-cleanups

delta: Some minor code style fixups

5 years agoMerge pull request #2202 from cgwalters/bootcsum-dtb
OpenShift Merge Robot [Thu, 24 Sep 2020 22:14:31 +0000 (22:14 +0000)]
Merge pull request #2202 from cgwalters/bootcsum-dtb

 deploy: Remove deployment bootcsum assertion

5 years agodelta: Some minor code style fixups
Colin Walters [Thu, 24 Sep 2020 22:12:23 +0000 (22:12 +0000)]
delta: Some minor code style fixups

- Remove some unused variables
- Switch to declare-and-initialize with others
- Fix some indentation from 4 spaces to 2 (GNU style)

5 years agodeploy: Remove deployment bootcsum assertion
Colin Walters [Thu, 24 Sep 2020 19:28:31 +0000 (19:28 +0000)]
deploy: Remove deployment bootcsum assertion

When support for devicetree was added, it created a problem
because old and new ostree versions would compute different
checksums for the "boot data".  The scenario here is:

- Have system with ostree < 2020.4
- Reboot into system with ostree 2020.5
- Try to perform an operation that would retain
  that previous booted deployment (common)

Currently ostree iterates over all the deployments
that will be retained and calls `install_deployment_kernel()`,
even for the booted one (which is a bit silly), but
just to verify that all boot data for the targeted
deployments are installed.

This then re-computes the checksum and we'd trip this
assertion.

In practice though, we don't strictly require them to match;
the only thing that will happen if they don't is that we'll
end up with another copy of the kernel/initramfs - and
that only temporarily until the previous deployment
gets GC'd.

Longer term, I think what we really want to do anyways
is probably closer to like a little ostree repo for `/boot`
so that we can e.g. still hardlink kernels there even if
the initramfs changes, or hardlink both kernel/initramfs
if just the devicetree changes, etc.

Closes: https://github.com/ostreedev/ostree/issues/2154
5 years agoMerge pull request #1985 from fdanis-oss/wip/fda/sign_delta_metadata
OpenShift Merge Robot [Thu, 24 Sep 2020 14:21:16 +0000 (14:21 +0000)]
Merge pull request #1985 from fdanis-oss/wip/fda/sign_delta_metadata

Static-delta's superblock signature support

5 years agoMerge pull request #2199 from cgwalters/no-hardlink-unreadable
OpenShift Merge Robot [Wed, 16 Sep 2020 15:58:55 +0000 (17:58 +0200)]
Merge pull request #2199 from cgwalters/no-hardlink-unreadable

checkout: Ensure copies of unreadable usermode checkouts are readable

5 years agocheckout: Ensure copies of unreadable usermode checkouts are readable
Colin Walters [Wed, 16 Sep 2020 13:23:04 +0000 (13:23 +0000)]
checkout: Ensure copies of unreadable usermode checkouts are readable

The extreme special case of "zero mode" files like `/etc/shadow`
comes up again.  What we want is for "user mode" checkouts to
override it to make the file readable; otherwise when operating
as non-root without `CAP_DAC_OVERRIDE` it becomes very difficult
to work with.

Previously, we were hardlinking these files, but then it intersects
with *another* special case around zero sized files, which is
*also* true for `/etc/shadow`.

Trying to avoid hardlinking there unveiled this bug - when
we go to do a copy checkout, we need to override the mode.

5 years agoMerge pull request #2195 from ostreedev/avoid-shadows
OpenShift Merge Robot [Mon, 14 Sep 2020 14:43:40 +0000 (10:43 -0400)]
Merge pull request #2195 from ostreedev/avoid-shadows

Avoid shadowing local variables

5 years agotests/delta: Add new tests for applying signed deltas
Frédéric Danis [Fri, 21 Aug 2020 15:24:49 +0000 (17:24 +0200)]
tests/delta: Add new tests for applying signed deltas

Add new test to apply offline signed deltas.

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
5 years agobin/static-delta: Add signature parameters to apply-offline
Frédéric Danis [Fri, 21 Aug 2020 15:22:40 +0000 (17:22 +0200)]
bin/static-delta: Add signature parameters to apply-offline

This allows to check the delta signature before applying it.

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
5 years agolib/deltas: Check signed delta in execute_offline
Frédéric Danis [Tue, 25 Aug 2020 07:26:09 +0000 (09:26 +0200)]
lib/deltas: Check signed delta in execute_offline

Add a new function `ostree_repo_static_delta_execute_offline_with_signature`
which takes a signature engine to verify the delta before applying it.
The `ostree_repo_static_delta_execute_offline` is just a wrapper to this
new function, passing a NULL signature engine.
When this function is called without signature engine, but with a sign
delta, it will only fails if `sign-verify-deltas` is set to true in repo
core options.

This commits move signature existence check and delta signature
verification to share common parts between existing APIs and the new
function.

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
5 years agotests/delta: new tests for 'ed25519' signed deltas
Frédéric Danis [Tue, 3 Dec 2019 10:15:51 +0000 (11:15 +0100)]
tests/delta: new tests for 'ed25519' signed deltas

Add tests to generate signed deltas and verify them using 'ed25519'
signature engine.

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
5 years agotests/libtest.sh: Add skip_without_sign_ed25519() function
Frédéric Danis [Thu, 23 Apr 2020 13:24:53 +0000 (15:24 +0200)]
tests/libtest.sh: Add skip_without_sign_ed25519() function

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
5 years agotests/delta: new tests for signed deltas
Frédéric Danis [Fri, 29 Nov 2019 15:17:17 +0000 (16:17 +0100)]
tests/delta: new tests for signed deltas

Add tests to generate signed deltas and verify them using 'dummy'
signature engine.

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
5 years agolib/deltas: Support signed delta in dump
Frédéric Danis [Thu, 9 Jul 2020 15:35:00 +0000 (17:35 +0200)]
lib/deltas: Support signed delta in dump

This checks if the static delta file is signed or not to be able to
correctly get the superblock to dump.

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
5 years agolib/deltas: Support signed delta in execute_offline
Frédéric Danis [Thu, 9 Jul 2020 15:34:08 +0000 (17:34 +0200)]
lib/deltas: Support signed delta in execute_offline

This checks if the static delta file is signed or not to be able to
correctly get the superblock to apply.

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
5 years agobin/static-delta: Add command to verify delta signature
Frédéric Danis [Fri, 29 Nov 2019 11:40:11 +0000 (12:40 +0100)]
bin/static-delta: Add command to verify delta signature

Add new "static-delta verify" sub-command.
This supports multiple keys to verify the static-delta file.

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
5 years agolib/deltas: Add signature check API for static-delta superblock
Frédéric Danis [Thu, 28 Nov 2019 11:18:59 +0000 (12:18 +0100)]
lib/deltas: Add signature check API for static-delta superblock

This retrieves the signatures and pass the static delta block as an array
of bytes to ostree_sign_data_verify().

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
5 years agobin/static-delta: Add support to sign superblock
Frédéric Danis [Tue, 26 Nov 2019 10:20:10 +0000 (11:20 +0100)]
bin/static-delta: Add support to sign superblock

Add signing ability to "static-delta generate" builtin.

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
5 years agolib/deltas: Add inline signature for static-delta superblock
Frédéric Danis [Wed, 8 Jul 2020 10:15:15 +0000 (12:15 +0200)]
lib/deltas: Add inline signature for static-delta superblock

While the commits contained in the single static-delta file are signed so
we can check them and operate on trusted data, the superblock isn't signed
in any way, so it end up operating on untrusted data to:
 1. actually find where the trusted data is, and
 2. check whether the update is fit for the current device by looking at
    the collection id stored in the metadata

This commit generates signatures of all static data, and concatenate them
to the existing static delta format, i.e. as a GVariant layout `a{sv}ay`
where
 - a{sv}: signatures
 - ay: existing delta variant

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
5 years agoAvoid shadowing local variables
Phaedrus Leeds [Sat, 12 Sep 2020 21:51:40 +0000 (14:51 -0700)]
Avoid shadowing local variables

This should help with code readability.

Fixes https://github.com/ostreedev/ostree/issues/2194

5 years agoMerge pull request #2196 from cgwalters/commit-shadowing-fix
OpenShift Merge Robot [Sun, 13 Sep 2020 17:00:16 +0000 (13:00 -0400)]
Merge pull request #2196 from cgwalters/commit-shadowing-fix

commit: Tighten scope of two variables

5 years agocommit: Tighten scope of two variables
Colin Walters [Sun, 13 Sep 2020 14:56:06 +0000 (14:56 +0000)]
commit: Tighten scope of two variables

Prep for adding `-Wshadow` fixes.

5 years agoMerge pull request #2193 from alexlarsson/preparatory-cleanup
OpenShift Merge Robot [Fri, 11 Sep 2020 15:07:00 +0000 (11:07 -0400)]
Merge pull request #2193 from alexlarsson/preparatory-cleanup

Preparatory cleanup for summary work

5 years agoUpdate the symbols files to match that we're now on 2020.6
Alexander Larsson [Fri, 11 Sep 2020 10:14:05 +0000 (12:14 +0200)]
Update the symbols files to match that we're now on 2020.6

5 years agoostree-repo-pull.c: Extract mirrorlist generation to helper
Alexander Larsson [Thu, 10 Sep 2020 09:58:38 +0000 (11:58 +0200)]
ostree-repo-pull.c: Extract mirrorlist generation to helper

This code was duplicated in 3 places, so move it to a single place
to clean things up.

5 years agoMinor cleanup of _ostree_repo_remote_new_fetcher()
Alexander Larsson [Thu, 10 Sep 2020 09:34:31 +0000 (11:34 +0200)]
Minor cleanup of _ostree_repo_remote_new_fetcher()

Instead of open coding the extra_headers and append_user_agent
setting everywhere we do this in the constructor.

5 years agoInline repo_remote_fetch_summary
Alexander Larsson [Thu, 10 Sep 2020 09:26:06 +0000 (11:26 +0200)]
Inline repo_remote_fetch_summary

This was only used in one place, and (especially with the simplification
with GMainContextPopDefault) and the one caller doesn't really do
much more than call the helper. Additionally, what little it does (saving
the result in the cache) is inherently tied to how the helper work,
and will become even more so when we support summary indexes.

This is a preparatory cleanup for supporting summary indexes. It
doesn't change any behaviour and passes make check on its own.

5 years agorepo_remote_fetch_summary: Use GMainContextPopDefault
Alexander Larsson [Thu, 10 Sep 2020 09:10:01 +0000 (11:10 +0200)]
repo_remote_fetch_summary: Use GMainContextPopDefault

This allows us to drop the "goto out" use and clean up this function.

5 years agoAdd g_autoptr helper for pushing a thread default main context
Alexander Larsson [Thu, 10 Sep 2020 09:00:35 +0000 (11:00 +0200)]
Add g_autoptr helper for pushing a thread default main context

This happens in a bunch of places, and currently each time it does
we have to use "goto out" style cleanups, which just isn't looking
very nice.

5 years agofetch_summary_with_options: drop unnecessary "goto out" use
Alexander Larsson [Thu, 10 Sep 2020 09:03:14 +0000 (11:03 +0200)]
fetch_summary_with_options: drop unnecessary "goto out" use

5 years agoBreak out the signature verification code into a helper function
Alexander Larsson [Thu, 10 Sep 2020 08:59:44 +0000 (10:59 +0200)]
Break out the signature verification code into a helper function

This changes nothing in the behaviour, but we want to later re-use
this when we also verify the summary index.

5 years agodeltas: Break out _ostree_repo_static_delta_superblock_digest() helper
Alexander Larsson [Mon, 31 Aug 2020 15:21:43 +0000 (17:21 +0200)]
deltas: Break out _ostree_repo_static_delta_superblock_digest() helper

This loads and makes a digest for a delta superblock. The previous
code was used when generating the deltas section in the summary
file. This changes nothing, but is in preparation for using similar
formats in a separate delta index file.

5 years agoAdd and use ot_checksum_bytes helper
Alexander Larsson [Thu, 10 Sep 2020 12:29:47 +0000 (14:29 +0200)]
Add and use ot_checksum_bytes helper

This removes some duplicated code (and will be use even more later).

5 years agopull: Actually mmap summary files
Alexander Larsson [Fri, 11 Sep 2020 09:24:43 +0000 (11:24 +0200)]
pull: Actually mmap summary files

The change in cbf1aca1d5c08d2f40832d16670484ba878d95fb actually
only mmaps the signature file, not the summary. This change makes
use mmap both, as well as extract the cache loading into a helper
function that we will later use in more places.

5 years agopull: Break out _ostree_repo_save_cache_summary_file() helper
Alexander Larsson [Fri, 11 Sep 2020 09:22:49 +0000 (11:22 +0200)]
pull: Break out _ostree_repo_save_cache_summary_file() helper

This is a minor cleanup as its just called twice from
_ostree_repo_cache_summary(). However, later code will need it in more
places.

5 years agoFix leak when signing
Alexander Larsson [Tue, 8 Sep 2020 09:37:33 +0000 (11:37 +0200)]
Fix leak when signing

_ostree_detached_metadata_append_gpg_sig() was returning a floating
ref, but all users were using g_autoptr. Fix it by adding a ref-sink.

5 years agolist-deltas: Don't break on non-subdir entries
Alexander Larsson [Mon, 31 Aug 2020 15:00:39 +0000 (17:00 +0200)]
list-deltas: Don't break on non-subdir entries

ostree_repo_list_static_delta_names() tried to validate that
any second-level directory element was a directory, but there was
a cut-and-paste issue, and it used `dent->d_type` instead
of `sub_dent->d_type`.

This fixes the code, but all old ostree versions will break if
there are non-directories in a subdirectory of the deltas directory
in the repo, so be wary.

5 years agoMerge pull request #2192 from cgwalters/error-prefixing
OpenShift Merge Robot [Wed, 9 Sep 2020 13:25:12 +0000 (09:25 -0400)]
Merge pull request #2192 from cgwalters/error-prefixing

deploy: Add some error prefixing around xattr setting

5 years agodeploy: Add some error prefixing around xattr setting
Colin Walters [Wed, 9 Sep 2020 12:34:44 +0000 (12:34 +0000)]
deploy: Add some error prefixing around xattr setting

Looking at
https://github.com/coreos/coreos-assembler/issues/1703
a user is getting a bare:
`error: fsetxattr: Permission denied`

I don't think it's these code paths since a deploy
isn't happening but on inspection I noticed we didn't
have error prefixing here.

5 years agoMerge pull request #2190 from cgwalters/ci-drop-var-test
OpenShift Merge Robot [Mon, 7 Sep 2020 23:26:02 +0000 (19:26 -0400)]
Merge pull request #2190 from cgwalters/ci-drop-var-test

ci: Drop var mount test

5 years agoci: Drop var mount test
Colin Walters [Thu, 3 Sep 2020 22:14:02 +0000 (22:14 +0000)]
ci: Drop var mount test

Merged in https://github.com/coreos/fedora-coreos-config/pull/586

5 years agoMerge pull request #2189 from cgwalters/release
OpenShift Merge Robot [Thu, 3 Sep 2020 18:41:11 +0000 (14:41 -0400)]
Merge pull request #2189 from cgwalters/release

Release 2020.6

5 years agoPost-release version bump
Colin Walters [Thu, 3 Sep 2020 18:00:27 +0000 (18:00 +0000)]
Post-release version bump

5 years agoRelease 2020.6
Colin Walters [Thu, 3 Sep 2020 18:00:03 +0000 (18:00 +0000)]
Release 2020.6

Let's get the /var mount fix out at least.

5 years agoMerge pull request #2186 from jlebon/pr/etc-rw
OpenShift Merge Robot [Fri, 28 Aug 2020 18:52:24 +0000 (14:52 -0400)]
Merge pull request #2186 from jlebon/pr/etc-rw

Fix read-only /etc when using sysroot=readonly and a separate /var mount

5 years agoci: Temporarily import kola test from jlebon's FCOS fork
Jonathan Lebon [Fri, 28 Aug 2020 16:49:32 +0000 (12:49 -0400)]
ci: Temporarily import kola test from jlebon's FCOS fork

That test will not make it into the fedora-coreos-config repo until the
libostree fix gets percolated down. PR is:

https://github.com/coreos/fedora-coreos-config/pull/586

But we want to make sure that the fix does work and that we don't
regress on it. So manually fetch it for now.

5 years agoostree-remount: Remount /etc rw if needed
Jonathan Lebon [Fri, 28 Aug 2020 16:35:29 +0000 (12:35 -0400)]
ostree-remount: Remount /etc rw if needed

When we remount `/sysroot` as read-only, we also make `/etc` read-only.
This is usually OK because we then remount `/var` read-write, which also
flips `/etc` back to read-write... unless `/var` is a separate
filesystem and not a bind-mount to the stateroot `/var`.

Fix this by just remounting `/etc` read-write in the read-only sysroot
case.

Eventually, I think we should rework this to set everything up the way
we want from the initramfs (#2115). This would also eliminate the window
during which `/etc` is read-only while `ostree-remount` runs.

5 years agoostree-prepare-root: Fix /etc bind mount
Jonathan Lebon [Fri, 28 Aug 2020 16:35:28 +0000 (12:35 -0400)]
ostree-prepare-root: Fix /etc bind mount

We were bind-mounting the initramfs' `/etc` (to itself) instead of the
target deployment `/etc` (to itself). Since we're already `chdir`'ed
into it, we can just drop the leading slash.

5 years agoMerge pull request #2184 from fkrull/docs-tags-fixes
OpenShift Merge Robot [Wed, 26 Aug 2020 21:45:28 +0000 (17:45 -0400)]
Merge pull request #2184 from fkrull/docs-tags-fixes

Add some missing GI tags

5 years agolib: mark out parameters as out parameters
Felix Krull [Tue, 25 Aug 2020 18:43:01 +0000 (20:43 +0200)]
lib: mark out parameters as out parameters

5 years agolib: add some missing version tags
Felix Krull [Tue, 25 Aug 2020 17:57:27 +0000 (19:57 +0200)]
lib: add some missing version tags

5 years agoMerge pull request #2183 from cgwalters/sh-inline-crates
OpenShift Merge Robot [Wed, 26 Aug 2020 19:04:24 +0000 (15:04 -0400)]
Merge pull request #2183 from cgwalters/sh-inline-crates

tests/inst: Update to published sh-inline crate

5 years agotests/inst: Update to published sh-inline crate
Colin Walters [Wed, 26 Aug 2020 17:00:19 +0000 (17:00 +0000)]
tests/inst: Update to published sh-inline crate

And I made a few more API tweaks, such as supporting `Path`
objects directly and also not needing e.g. `commit = commit`, see

- https://github.com/cgwalters/rust-sh-inline/commit/cfa7c71126f23545a7d4782cad650eab60e74204
- https://github.com/cgwalters/rust-sh-inline/commit/679bce4cc7ce65641e0c9bd33654510575583de8

5 years agoMerge pull request #2181 from cgwalters/port-sh-inline
OpenShift Merge Robot [Wed, 26 Aug 2020 15:01:52 +0000 (11:01 -0400)]
Merge pull request #2181 from cgwalters/port-sh-inline

tests/inst: Port to new sh-inline repo

5 years agoMerge pull request #2182 from mbilker/arch-linux
OpenShift Merge Robot [Wed, 26 Aug 2020 12:42:37 +0000 (08:42 -0400)]
Merge pull request #2182 from mbilker/arch-linux

Fix mkinitcpio with newer systemd versions

5 years agoFix mkinitcpio with newer systemd versions
Matt Bilker [Tue, 25 Aug 2020 22:12:52 +0000 (18:12 -0400)]
Fix mkinitcpio with newer systemd versions

- Fixes systemd failing to determine if `/sysroot` is valid because of
  `/etc/os-release` not being available yet.

- Related: #1759

5 years agotests/inst: Port to new sh-inline repo
Colin Walters [Tue, 25 Aug 2020 22:06:13 +0000 (22:06 +0000)]
tests/inst: Port to new sh-inline repo

I cleaned up my fork of commandspec (see git log) and am
planning to publish to crates.  Port to the new API in prep
for that.

5 years agoMerge pull request #2180 from jlebon/pr/devel-build
OpenShift Merge Robot [Mon, 24 Aug 2020 19:05:20 +0000 (15:05 -0400)]
Merge pull request #2180 from jlebon/pr/devel-build

configure.ac: Set is_release_build=no

5 years agoconfigure.ac: Set is_release_build=no
Jonathan Lebon [Mon, 24 Aug 2020 18:16:16 +0000 (14:16 -0400)]
configure.ac: Set is_release_build=no

We missed this during the post-release version bump.

5 years agoMerge pull request #2179 from cgwalters/ioctl-fix
OpenShift Merge Robot [Sat, 22 Aug 2020 00:13:51 +0000 (20:13 -0400)]
Merge pull request #2179 from cgwalters/ioctl-fix

linuxfsutil: Pass int to ioctl, not long

5 years agoMerge pull request #2178 from cgwalters/ioctl-test
OpenShift Merge Robot [Fri, 21 Aug 2020 18:40:21 +0000 (14:40 -0400)]
Merge pull request #2178 from cgwalters/ioctl-test

tests: Check the immutable bit

5 years agolinuxfsutil: Pass int to ioctl, not long
Colin Walters [Fri, 21 Aug 2020 17:40:41 +0000 (17:40 +0000)]
linuxfsutil: Pass int to ioctl, not long

Otherwise it will fail on big-endian architectures like s390x.
Ref https://bugzilla.redhat.com/show_bug.cgi?id=1867601

5 years agotests: Check the immutable bit
Colin Walters [Fri, 21 Aug 2020 17:35:03 +0000 (17:35 +0000)]
tests: Check the immutable bit

See https://bugzilla.redhat.com/show_bug.cgi?id=1867601

We really want an upstream test for this, even if (to my knowledge)
nothing is running ostree's upstream CI on !x86_64.

5 years agoMerge pull request #2177 from smcv/systemd-no-syslog
OpenShift Merge Robot [Fri, 21 Aug 2020 12:57:29 +0000 (14:57 +0200)]
Merge pull request #2177 from smcv/systemd-no-syslog

boot: Replace deprecated StandardOutput=syslog with journal, etc.