keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
de7d20e43b
rpm-ostree/src/libpriv/rpmostree-origin.h

206 lines
7.2 KiB
C
Raw Normal View History

daemon: Introduce an origin structure In prep for adding "regenerates initramfs" to "is locally assembled", we need more abstraction. I previously introduced a helper function, but I'd still need to touch every call site when changing that. Rather than having each caller re-parse the origin, let's parse it once into a structure, and then have error-free accessors for it (that also don't malloc). This way when adding a new flag, I don't need to touch every call site. Notes: - Some places in the code (like the deployments -> variant bits) tried to handle deployments without an origin gracefully. That's no longer true. I'm not sure how much we care - do we? - There are a few places where I changed `packagelist.len() > 0` to `is_locally_assembled()`. I think this is right, but we'll need to be sure the "no packages to overlay, just initramfs" case works when that lands. Closes: #566 Approved by: jlebon
2017-01-11 22:05:18 +03:00
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
*
* Copyright (C) 2017 Colin Walters <walters@verbum.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation; either version 2 of the licence or (at
* your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
#pragma once
#include <ostree.h>
Add support for `rebase rojig://` This is an initial drop of support for: `rpm-ostree rebase rojig://fahc:fedora-atomic-host`. We also then support `rpm-ostree upgrade` from that. There's a lot that could be improved here; the test coverage is relatively minimal. A blocking issue there is having a realistic jigdo setup, and that's going to require changing how we do testing. For now, this means that if we want to e.g. change the format we'll have to temporarily disable this test, get the format change in, update FAHC, then re-enable the test. Closes: #1166 Approved by: jlebon
2018-01-17 18:33:46 +03:00
#include "rpmostree-core.h"
daemon: Introduce an origin structure In prep for adding "regenerates initramfs" to "is locally assembled", we need more abstraction. I previously introduced a helper function, but I'd still need to touch every call site when changing that. Rather than having each caller re-parse the origin, let's parse it once into a structure, and then have error-free accessors for it (that also don't malloc). This way when adding a new flag, I don't need to touch every call site. Notes: - Some places in the code (like the deployments -> variant bits) tried to handle deployments without an origin gracefully. That's no longer true. I'm not sure how much we care - do we? - There are a few places where I changed `packagelist.len() > 0` to `is_locally_assembled()`. I think this is right, but we'll need to be sure the "no packages to overlay, just initramfs" case works when that lands. Closes: #566 Approved by: jlebon
2017-01-11 22:05:18 +03:00
tree-wide: Add extern "C" wrapping to our headers Prep for (potentially) using https://cxx.rs We want our header files to be includable in C++.
2020-11-23 03:22:52 +03:00
G_BEGIN_DECLS
daemon: Introduce an origin structure In prep for adding "regenerates initramfs" to "is locally assembled", we need more abstraction. I previously introduced a helper function, but I'd still need to touch every call site when changing that. Rather than having each caller re-parse the origin, let's parse it once into a structure, and then have error-free accessors for it (that also don't malloc). This way when adding a new flag, I don't need to touch every call site. Notes: - Some places in the code (like the deployments -> variant bits) tried to handle deployments without an origin gracefully. That's no longer true. I'm not sure how much we care - do we? - There are a few places where I changed `packagelist.len() > 0` to `is_locally_assembled()`. I think this is right, but we'll need to be sure the "no packages to overlay, just initramfs" case works when that lands. Closes: #566 Approved by: jlebon
2017-01-11 22:05:18 +03:00
typedef struct RpmOstreeOrigin RpmOstreeOrigin;
daemon/upgrader: Rework layer tracking Working on initramfs, I hit a subtle issue with the fact that I was trying to "redeploy", but with the origin file changed during the process. Previously, it was a bit unclear which parts of the upgrader logic are operating on the *new* origin versus the "original origin". The package layering code in the upgrader explicitly carries a delta on top in the "add/remove" hash sets, which means it isn't visible to `rpmostree_origin_is_locally_assembled()`. Whereas for initramfs, I set a new origin. This broke things since we were expecting to find a parent commit, but the original origin wasn't locally assembled. When looking more at this, I realized there's a far simpler model - rather than keeping track of commit + origin, and using the origin to try to determine whether or not the commit is layered, we can keep track of `base_revision` and `final_revision`, and the latter is only set if we're doing layering. The diff speaks for itself here - a lot of fragile logic looking at the origin drops away. The next step here is probably to drop away the package layering hash sets, but I'm trying to not change everything at once. Closes: #579 Approved by: jlebon
2017-01-17 20:25:28 +03:00
RpmOstreeOrigin *rpmostree_origin_ref (RpmOstreeOrigin *origin);
daemon: Introduce an origin structure In prep for adding "regenerates initramfs" to "is locally assembled", we need more abstraction. I previously introduced a helper function, but I'd still need to touch every call site when changing that. Rather than having each caller re-parse the origin, let's parse it once into a structure, and then have error-free accessors for it (that also don't malloc). This way when adding a new flag, I don't need to touch every call site. Notes: - Some places in the code (like the deployments -> variant bits) tried to handle deployments without an origin gracefully. That's no longer true. I'm not sure how much we care - do we? - There are a few places where I changed `packagelist.len() > 0` to `is_locally_assembled()`. I think this is right, but we'll need to be sure the "no packages to overlay, just initramfs" case works when that lands. Closes: #566 Approved by: jlebon
2017-01-11 22:05:18 +03:00
void rpmostree_origin_unref (RpmOstreeOrigin *origin);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(RpmOstreeOrigin, rpmostree_origin_unref)
RpmOstreeOrigin *
rpmostree_origin_parse_keyfile (GKeyFile *keyfile,
GError **error);
static inline
RpmOstreeOrigin *
RpmOstreeOrigin: don't error on unconfigured state This is a follow-up to 775c781 (#626). Really, RpmOstreeOrigin shouldn't concern itself with whether the origin is unconfigured. Its main goal should be to parse it out and make it easy for users to modify it. That sort of business logic lives in the upgrader, which *should* be concerned if the origin in unconfigured. Closes: #634 Approved by: cgwalters
2017-02-16 20:46:13 +03:00
rpmostree_origin_parse_deployment (OstreeDeployment *deployment,
GError **error)
daemon: Introduce an origin structure In prep for adding "regenerates initramfs" to "is locally assembled", we need more abstraction. I previously introduced a helper function, but I'd still need to touch every call site when changing that. Rather than having each caller re-parse the origin, let's parse it once into a structure, and then have error-free accessors for it (that also don't malloc). This way when adding a new flag, I don't need to touch every call site. Notes: - Some places in the code (like the deployments -> variant bits) tried to handle deployments without an origin gracefully. That's no longer true. I'm not sure how much we care - do we? - There are a few places where I changed `packagelist.len() > 0` to `is_locally_assembled()`. I think this is right, but we'll need to be sure the "no packages to overlay, just initramfs" case works when that lands. Closes: #566 Approved by: jlebon
2017-01-11 22:05:18 +03:00
{
GKeyFile *origin = ostree_deployment_get_origin (deployment);
if (!origin)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"No origin known for deployment %s.%d",
ostree_deployment_get_csum (deployment),
ostree_deployment_get_deployserial (deployment));
return NULL;
}
RpmOstreeOrigin: don't error on unconfigured state This is a follow-up to 775c781 (#626). Really, RpmOstreeOrigin shouldn't concern itself with whether the origin is unconfigured. Its main goal should be to parse it out and make it easy for users to modify it. That sort of business logic lives in the upgrader, which *should* be concerned if the origin in unconfigured. Closes: #634 Approved by: cgwalters
2017-02-16 20:46:13 +03:00
return rpmostree_origin_parse_keyfile (origin, error);
daemon: Introduce an origin structure In prep for adding "regenerates initramfs" to "is locally assembled", we need more abstraction. I previously introduced a helper function, but I'd still need to touch every call site when changing that. Rather than having each caller re-parse the origin, let's parse it once into a structure, and then have error-free accessors for it (that also don't malloc). This way when adding a new flag, I don't need to touch every call site. Notes: - Some places in the code (like the deployments -> variant bits) tried to handle deployments without an origin gracefully. That's no longer true. I'm not sure how much we care - do we? - There are a few places where I changed `packagelist.len() > 0` to `is_locally_assembled()`. I think this is right, but we'll need to be sure the "no packages to overlay, just initramfs" case works when that lands. Closes: #566 Approved by: jlebon
2017-01-11 22:05:18 +03:00
}
upgrader: move origin mutation outside of the upgrader This is the beginning of a move towards making the upgrader more stateless and less hysteretic. Ideally, the only input required should be an origin file. Users of the upgrader are in charge of modifying the origin as needed. The main goal of this is to simplify the upgrader model and a better separation of concerns. This was already done for the initramfs-related entries. This patch formalises this for most of the other inputs, except packages, which will be done soon. Closes: #634 Approved by: cgwalters
2017-02-15 20:41:38 +03:00
RpmOstreeOrigin *
rpmostree_origin_dup (RpmOstreeOrigin *origin);
daemon/upgrader: Consistently remove transient state With the new support for pinning deployments, we need to also update rpm-ostree to clean up the transient state as is now done in the ostree sysroot upgrader. This addresses that issue as well as tries to be a little cleaner in how we clean up other transient state. Notably, we add a new helper function to `RpmOstreeOrigin` to do this for us and use it in the upgrader. In other cases, we do want this transient information since it allows us to describe the deployment. Closes: https://github.com/ostreedev/ostree/issues/1595 Closes: #1372 Approved by: cgwalters
2018-05-22 22:20:33 +03:00
void
rpmostree_origin_remove_transient_state (RpmOstreeOrigin *origin);
daemon: Introduce an origin structure In prep for adding "regenerates initramfs" to "is locally assembled", we need more abstraction. I previously introduced a helper function, but I'd still need to touch every call site when changing that. Rather than having each caller re-parse the origin, let's parse it once into a structure, and then have error-free accessors for it (that also don't malloc). This way when adding a new flag, I don't need to touch every call site. Notes: - Some places in the code (like the deployments -> variant bits) tried to handle deployments without an origin gracefully. That's no longer true. I'm not sure how much we care - do we? - There are a few places where I changed `packagelist.len() > 0` to `is_locally_assembled()`. I think this is right, but we'll need to be sure the "no packages to overlay, just initramfs" case works when that lands. Closes: #566 Approved by: jlebon
2017-01-11 22:05:18 +03:00
const char *
rpmostree_origin_get_refspec (RpmOstreeOrigin *origin);
Add support for `rebase rojig://` This is an initial drop of support for: `rpm-ostree rebase rojig://fahc:fedora-atomic-host`. We also then support `rpm-ostree upgrade` from that. There's a lot that could be improved here; the test coverage is relatively minimal. A blocking issue there is having a realistic jigdo setup, and that's going to require changing how we do testing. For now, this means that if we want to e.g. change the format we'll have to temporarily disable this test, get the format change in, update FAHC, then re-enable the test. Closes: #1166 Approved by: jlebon
2018-01-17 18:33:46 +03:00
void
rpmostree_origin_classify_refspec (RpmOstreeOrigin *origin,
RpmOstreeRefspecType *out_type,
const char **out_refspecdata);
char *
rpmostree_origin_get_full_refspec (RpmOstreeOrigin *origin,
RpmOstreeRefspecType *out_refspectype);
daemon: Add an origin_is_rojig() helper Suggested in another PR review, it makes the code nicer. Closes: #1252 Approved by: jlebon
2018-02-13 23:11:36 +03:00
gboolean rpmostree_origin_is_rojig (RpmOstreeOrigin *origin);
Add support for `rebase rojig://` This is an initial drop of support for: `rpm-ostree rebase rojig://fahc:fedora-atomic-host`. We also then support `rpm-ostree upgrade` from that. There's a lot that could be improved here; the test coverage is relatively minimal. A blocking issue there is having a realistic jigdo setup, and that's going to require changing how we do testing. For now, this means that if we want to e.g. change the format we'll have to temporarily disable this test, get the format change in, update FAHC, then re-enable the test. Closes: #1166 Approved by: jlebon
2018-01-17 18:33:46 +03:00
const char *
rojig-rename: API functions in core/origin, pruning refspec This renames the API functions in the core and origin, and also fixes up the fact that we were still looking for `jigdo/` refs in the pruning code. Closes: #1279 Approved by: jlebon
2018-02-27 23:05:44 +03:00
rpmostree_origin_get_rojig_version (RpmOstreeOrigin *origin);
Add support for `rebase rojig://` This is an initial drop of support for: `rpm-ostree rebase rojig://fahc:fedora-atomic-host`. We also then support `rpm-ostree upgrade` from that. There's a lot that could be improved here; the test coverage is relatively minimal. A blocking issue there is having a realistic jigdo setup, and that's going to require changing how we do testing. For now, this means that if we want to e.g. change the format we'll have to temporarily disable this test, get the format change in, update FAHC, then re-enable the test. Closes: #1166 Approved by: jlebon
2018-01-17 18:33:46 +03:00
status: Render jigdo mode using package NEVRA What's happened up till now is supporting `rojig://` in the same way as `ostree://`. However, part of the high level goal here is to reduce the need for system administrators to understand ostree. This patch set starts to introduce some of the ideas for client-side changes as part of jigdo ♲📦: https://github.com/projectatomic/rpm-ostree/issues/1081#issuecomment-348540604 Concretely, we start using `${repo}:${nevra}` instead of `rojig://`. (v2): Keep `Version` (plus timestamp) as a split out field for maximum visual aid. Also, let's be opinionated here and entirely drop the `Commit` checksum by default. I believe the Cockpit guys were right here - versions are for humans. The fact that we have a checksum is powerful; and we still show it with `status -v`. The way I think of it is: the checksum shows we're really an image system. But we don't need to show it by default. Closes: #1240 Approved by: jlebon
2018-02-11 20:52:16 +03:00
GVariant *
rojig-rename: API functions in core/origin, pruning refspec This renames the API functions in the core and origin, and also fixes up the fact that we were still looking for `jigdo/` refs in the pruning code. Closes: #1279 Approved by: jlebon
2018-02-27 23:05:44 +03:00
rpmostree_origin_get_rojig_description (RpmOstreeOrigin *origin);
status: Render jigdo mode using package NEVRA What's happened up till now is supporting `rojig://` in the same way as `ostree://`. However, part of the high level goal here is to reduce the need for system administrators to understand ostree. This patch set starts to introduce some of the ideas for client-side changes as part of jigdo ♲📦: https://github.com/projectatomic/rpm-ostree/issues/1081#issuecomment-348540604 Concretely, we start using `${repo}:${nevra}` instead of `rojig://`. (v2): Keep `Version` (plus timestamp) as a split out field for maximum visual aid. Also, let's be opinionated here and entirely drop the `Commit` checksum by default. I believe the Cockpit guys were right here - versions are for humans. The fact that we have a checksum is powerful; and we still show it with `status -v`. The way I think of it is: the checksum shows we're really an image system. But we don't need to show it by default. Closes: #1240 Approved by: jlebon
2018-02-11 20:52:16 +03:00
rebase: Add support for "custom origin" descriptions We're looking to embed an ostree commit inside a container image, to make it easier to transport around with other images. Conceptually here the host system is tracking a container (just like for rojig we're tracking an RPM). This is the first step towards making that support nicer; tooling can do `rebase --custom-origin-url oscontainer://quay.io/exampleos@sha256:...` and have that show up in `rpm-ostree status`. There are two values, one intended to be machine readable (like the `ostree://` and `rojig://` and one for humans which we display when an admin types `rpm-ostree upgrade`. This builds on prior work in 27bd7b97bbef3b4c4b2ecd80a832d45e84f13932 from #1396 . Closes: #1406 Approved by: jlebon
2018-06-08 22:39:56 +03:00
void
rpmostree_origin_get_custom_description (RpmOstreeOrigin *origin,
char **custom_type,
char **custom_description);
upgrader: switch to stateless model This is the culmination of the work paved by the previous commits. We no longer handle package set mutations in the upgrader, but rather let clients modify the origin as needed for that. As such, the upgrader is now completely memoryless. We no longer try to error out if a package is already in the base and we no longer drop out packages previously layered packages that are now in the base. *Which* packages actually get layered is determined during deployment and not coded in the origin. At an API level, the deployment variant returned (and thus what gets printed by `status --json`) now has both "packages" and "requested-packages". The former retains its original semantic: it's the set of packages that are *actually* layered. The latter contains everything from the origin, which includes the former set + dormant packages. Accordingly, the output of `rpm-ostree status` also now distinguishes between "RequestedPackages" and "LayeredPackages". Extra: we now quote provides that contain spaces. Closes: #646 Approved by: cgwalters
2017-02-24 17:44:40 +03:00
GHashTable *
daemon: Introduce an origin structure In prep for adding "regenerates initramfs" to "is locally assembled", we need more abstraction. I previously introduced a helper function, but I'd still need to touch every call site when changing that. Rather than having each caller re-parse the origin, let's parse it once into a structure, and then have error-free accessors for it (that also don't malloc). This way when adding a new flag, I don't need to touch every call site. Notes: - Some places in the code (like the deployments -> variant bits) tried to handle deployments without an origin gracefully. That's no longer true. I'm not sure how much we care - do we? - There are a few places where I changed `packagelist.len() > 0` to `is_locally_assembled()`. I think this is right, but we'll need to be sure the "no packages to overlay, just initramfs" case works when that lands. Closes: #566 Approved by: jlebon
2017-01-11 22:05:18 +03:00
rpmostree_origin_get_packages (RpmOstreeOrigin *origin);
PkgChange: add support for layering local RPMs Allow users to directly specify an RPM file on the command-line. The "packages_added" array of the PkgChange() method can now contain absolute paths to RPM files. Grow the origin format to have a new "requested-local" key. This is similar to the "requested" key, except that the packages are always installed from cache. The "requested-local" array values also embed the SHA-256 of the header we expect. There is now a new "LocalPackages" line in the status. These packages are a subset of the "packages" element (which are printed as "LayeredPackages") and represent the packages that are explicitly marked for installing from cache. Interesting design choices/notes: - Just as before, even with foo-1.0-1.x86_64 installed from RPM, a user can still request "/usr/bin/foo": it will be made dormant. As soon as foo stops being explicitly layered from the RPM, it will try to fulfill the request by going to the repos. This allows users to "pin" a layered package to a certain RPM, and then unpin it. - The strings/NEVRAs in "requested" and "requested-local" are strictly distinct. This allows us to be able to tell what the user means exactly when they do "rpm-ostree uninstall". Closes: #657 Approved by: cgwalters
2017-03-03 23:48:56 +03:00
GHashTable *
rpmostree_origin_get_local_packages (RpmOstreeOrigin *origin);
app: add experimental support for pkg removals This is one more step towards making rpm-ostree more powerful in its quest to be the ultimate *hybrid* image/package system. Package layering allows us to add packages on top of the base package set received from the content provider. However, we're not able to remove or replace packages in the base set itself. This patch introduces a new `override` command, which is for now nested under the experimental `ex` command. The `override` command will allow users to modify the base package set itself. The first implemented subcommands are `remove` and `reset`. A stub has been provided for the more useful `replace` subcommand, though much of the needed logic for that operation are implemented in this patch as part of the `remove` subcommand. Part of: https://github.com/projectatomic/rpm-ostree/issues/485 Closes: #797 Approved by: cgwalters
2017-06-05 19:37:56 +03:00
GHashTable *
rpmostree_origin_get_overrides_remove (RpmOstreeOrigin *origin);
app: support `ex override replace` for local RPMs Add experimental support for replacing packages from the base layer with local RPMs. This is useful for example, to cherry pick a fixed package, or to roll back to a previous package version. Like with pkg removals, only files in /usr are actually replaced. This patch also contains a few usability improvements as well, e.g. showing the full NEVRA of removed packages rather than just their names, and support for resetting overrides using either the pkgname or NEVRA. Closes: #852 Approved by: cgwalters
2017-07-04 20:50:52 +03:00
GHashTable *
rpmostree_origin_get_overrides_local_replace (RpmOstreeOrigin *origin);
daemon: Introduce an origin structure In prep for adding "regenerates initramfs" to "is locally assembled", we need more abstraction. I previously introduced a helper function, but I'd still need to touch every call site when changing that. Rather than having each caller re-parse the origin, let's parse it once into a structure, and then have error-free accessors for it (that also don't malloc). This way when adding a new flag, I don't need to touch every call site. Notes: - Some places in the code (like the deployments -> variant bits) tried to handle deployments without an origin gracefully. That's no longer true. I'm not sure how much we care - do we? - There are a few places where I changed `packagelist.len() > 0` to `is_locally_assembled()`. I think this is right, but we'll need to be sure the "no packages to overlay, just initramfs" case works when that lands. Closes: #566 Approved by: jlebon
2017-01-11 22:05:18 +03:00
const char *
rpmostree_origin_get_override_commit (RpmOstreeOrigin *origin);
Add new `ex initramfs-etc` command This command allows users to cheaply inject configuration files in the initramfs stage without having to regenerate the whole initramfs (or even a new OSTree commit). This will be useful for configuring services involved in bringing up the root block device. ``` $ echo 'hello world' > /etc/foobar $ rpm-ostree ex initramfs-etc --track /etc/foobar Staging deployment... done Run "systemctl reboot" to start a reboot $ rpm-ostree status State: idle Deployments: ostree://fedora:fedora/x86_64/coreos/testing-devel Version: 32.20200716.dev.1 (2020-07-16T02:47:29Z) Commit: 9a817d75bef81b955179be6e602d1e6ae350645b6323231a62ba2ee6e5b9644b GPGSignature: (unsigned) InitramfsEtc: /etc/foobar ● ostree://fedora:fedora/x86_64/coreos/testing-devel Version: 32.20200716.dev.1 (2020-07-16T02:47:29Z) Commit: 9a817d75bef81b955179be6e602d1e6ae350645b6323231a62ba2ee6e5b9644b GPGSignature: (unsigned) $ reboot (boot into rd.break) sh-5.0# cat /etc/foobar hello world ``` See the libostree side of this at: https://github.com/ostreedev/ostree/pull/2155 Lots more discussions in: https://github.com/coreos/fedora-coreos-tracker/issues/94 Closes: #1930
2020-07-25 00:35:01 +03:00
GHashTable *
rpmostree_origin_get_initramfs_etc_files (RpmOstreeOrigin *origin);
Support "system/regenerate-initramfs=true" flag in origin Currently we push for a model where the initramfs is generated (in non-hostonly mode), and merely replicated. However, to support a few unfortunate corner cases like dm-multipath which wants to inject a config file into the initramfs, we need to support regenerating it client side too. Down the line, we'll need this to support overriding the kernel too. This changes things in the core to add the concept of an "empty" `RpmOstreeContext`. I initially tried skipping it, but that was too much duplication. We still want all of the core ostree-related logic that lives in that code too. The treespec bits barfed if the spec didn't have a `tree/packages` key. It was simplest to change that to allow it - and because that was the only case where we errored out in parsing, I dropped the error handling. There was another place in the upgrader that now needed to be fixed to handle transitioning from just regenerating initramfs to not. Closes: #574 Approved by: jlebon
2017-01-04 20:29:01 +03:00
gboolean
rpmostree_origin_get_regenerate_initramfs (RpmOstreeOrigin *origin);
RpmOstreeOrigin: also cache initramfs args Ideally, we want to parse out everything in the origin on init and then cache the values to make it even easier to inspect it. We make this more explicit by renaming the struct members to "cache_*" and also caching the initramfs args. This doesn't actually save any allocations right now (though it might in the future), but we do the same for everything else, and it's nice to be consistent. Closes: #646 Approved by: cgwalters
2017-02-24 17:44:40 +03:00
const char *const*
Support "system/regenerate-initramfs=true" flag in origin Currently we push for a model where the initramfs is generated (in non-hostonly mode), and merely replicated. However, to support a few unfortunate corner cases like dm-multipath which wants to inject a config file into the initramfs, we need to support regenerating it client side too. Down the line, we'll need this to support overriding the kernel too. This changes things in the core to add the concept of an "empty" `RpmOstreeContext`. I initially tried skipping it, but that was too much duplication. We still want all of the core ostree-related logic that lives in that code too. The treespec bits barfed if the spec didn't have a `tree/packages` key. It was simplest to change that to allow it - and because that was the only case where we errored out in parsing, I dropped the error handling. There was another place in the upgrader that now needed to be fixed to handle transitioning from just regenerating initramfs to not. Closes: #574 Approved by: jlebon
2017-01-04 20:29:01 +03:00
rpmostree_origin_get_initramfs_args (RpmOstreeOrigin *origin);
upgrader: switch to stateless model This is the culmination of the work paved by the previous commits. We no longer handle package set mutations in the upgrader, but rather let clients modify the origin as needed for that. As such, the upgrader is now completely memoryless. We no longer try to error out if a package is already in the base and we no longer drop out packages previously layered packages that are now in the base. *Which* packages actually get layered is determined during deployment and not coded in the origin. At an API level, the deployment variant returned (and thus what gets printed by `status --json`) now has both "packages" and "requested-packages". The former retains its original semantic: it's the set of packages that are *actually* layered. The latter contains everything from the origin, which includes the former set + dormant packages. Accordingly, the output of `rpm-ostree status` also now distinguishes between "RequestedPackages" and "LayeredPackages". Extra: we now quote provides that contain spaces. Closes: #646 Approved by: cgwalters
2017-02-24 17:44:40 +03:00
const char *
rpmostree_origin_get_unconfigured_state (RpmOstreeOrigin *origin);
origin: add helper to check if local assembly needed It's less cumbersome to check for this in the origin. Factor it out there so that it's easier to modify it in the future. Closes: #804 Approved by: cgwalters
2017-05-29 21:45:15 +03:00
gboolean
rpmostree_origin_may_require_local_assembly (RpmOstreeOrigin *origin);
daemon: Introduce an origin structure In prep for adding "regenerates initramfs" to "is locally assembled", we need more abstraction. I previously introduced a helper function, but I'd still need to touch every call site when changing that. Rather than having each caller re-parse the origin, let's parse it once into a structure, and then have error-free accessors for it (that also don't malloc). This way when adding a new flag, I don't need to touch every call site. Notes: - Some places in the code (like the deployments -> variant bits) tried to handle deployments without an origin gracefully. That's no longer true. I'm not sure how much we care - do we? - There are a few places where I changed `packagelist.len() > 0` to `is_locally_assembled()`. I think this is right, but we'll need to be sure the "no packages to overlay, just initramfs" case works when that lands. Closes: #566 Approved by: jlebon
2017-01-11 22:05:18 +03:00
char *
rpmostree_origin_get_string (RpmOstreeOrigin *origin,
const char *section,
const char *value);
GKeyFile *
rpmostree_origin_dup_keyfile (RpmOstreeOrigin *origin);
Add new `ex initramfs-etc` command This command allows users to cheaply inject configuration files in the initramfs stage without having to regenerate the whole initramfs (or even a new OSTree commit). This will be useful for configuring services involved in bringing up the root block device. ``` $ echo 'hello world' > /etc/foobar $ rpm-ostree ex initramfs-etc --track /etc/foobar Staging deployment... done Run "systemctl reboot" to start a reboot $ rpm-ostree status State: idle Deployments: ostree://fedora:fedora/x86_64/coreos/testing-devel Version: 32.20200716.dev.1 (2020-07-16T02:47:29Z) Commit: 9a817d75bef81b955179be6e602d1e6ae350645b6323231a62ba2ee6e5b9644b GPGSignature: (unsigned) InitramfsEtc: /etc/foobar ● ostree://fedora:fedora/x86_64/coreos/testing-devel Version: 32.20200716.dev.1 (2020-07-16T02:47:29Z) Commit: 9a817d75bef81b955179be6e602d1e6ae350645b6323231a62ba2ee6e5b9644b GPGSignature: (unsigned) $ reboot (boot into rd.break) sh-5.0# cat /etc/foobar hello world ``` See the libostree side of this at: https://github.com/ostreedev/ostree/pull/2155 Lots more discussions in: https://github.com/coreos/fedora-coreos-tracker/issues/94 Closes: #1930
2020-07-25 00:35:01 +03:00
void
rpmostree_origin_initramfs_etc_files_track (RpmOstreeOrigin *origin,
char **paths,
gboolean *out_changed);
void
rpmostree_origin_initramfs_etc_files_untrack (RpmOstreeOrigin *origin,
char **paths,
gboolean *out_changed);
void
rpmostree_origin_initramfs_etc_files_untrack_all (RpmOstreeOrigin *origin,
gboolean *out_changed);
upgrader: move origin mutation outside of the upgrader This is the beginning of a move towards making the upgrader more stateless and less hysteretic. Ideally, the only input required should be an origin file. Users of the upgrader are in charge of modifying the origin as needed. The main goal of this is to simplify the upgrader model and a better separation of concerns. This was already done for the initramfs-related entries. This patch formalises this for most of the other inputs, except packages, which will be done soon. Closes: #634 Approved by: cgwalters
2017-02-15 20:41:38 +03:00
void
rpmostree_origin_set_regenerate_initramfs (RpmOstreeOrigin *origin,
gboolean regenerate,
char **args);
void
rpmostree_origin_set_override_commit (RpmOstreeOrigin *origin,
const char *checksum,
const char *version);
status: Render jigdo mode using package NEVRA What's happened up till now is supporting `rojig://` in the same way as `ostree://`. However, part of the high level goal here is to reduce the need for system administrators to understand ostree. This patch set starts to introduce some of the ideas for client-side changes as part of jigdo ♲📦: https://github.com/projectatomic/rpm-ostree/issues/1081#issuecomment-348540604 Concretely, we start using `${repo}:${nevra}` instead of `rojig://`. (v2): Keep `Version` (plus timestamp) as a split out field for maximum visual aid. Also, let's be opinionated here and entirely drop the `Commit` checksum by default. I believe the Cockpit guys were right here - versions are for humans. The fact that we have a checksum is powerful; and we still show it with `status -v`. The way I think of it is: the checksum shows we're really an image system. But we don't need to show it by default. Closes: #1240 Approved by: jlebon
2018-02-11 20:52:16 +03:00
void
rojig-rename: API functions in core/origin, pruning refspec This renames the API functions in the core and origin, and also fixes up the fact that we were still looking for `jigdo/` refs in the pruning code. Closes: #1279 Approved by: jlebon
2018-02-27 23:05:44 +03:00
rpmostree_origin_set_rojig_description (RpmOstreeOrigin *origin,
status: Render jigdo mode using package NEVRA What's happened up till now is supporting `rojig://` in the same way as `ostree://`. However, part of the high level goal here is to reduce the need for system administrators to understand ostree. This patch set starts to introduce some of the ideas for client-side changes as part of jigdo ♲📦: https://github.com/projectatomic/rpm-ostree/issues/1081#issuecomment-348540604 Concretely, we start using `${repo}:${nevra}` instead of `rojig://`. (v2): Keep `Version` (plus timestamp) as a split out field for maximum visual aid. Also, let's be opinionated here and entirely drop the `Commit` checksum by default. I believe the Cockpit guys were right here - versions are for humans. The fact that we have a checksum is powerful; and we still show it with `status -v`. The way I think of it is: the checksum shows we're really an image system. But we don't need to show it by default. Closes: #1240 Approved by: jlebon
2018-02-11 20:52:16 +03:00
DnfPackage *package);
upgrader: move origin mutation outside of the upgrader This is the beginning of a move towards making the upgrader more stateless and less hysteretic. Ideally, the only input required should be an origin file. Users of the upgrader are in charge of modifying the origin as needed. The main goal of this is to simplify the upgrader model and a better separation of concerns. This was already done for the initramfs-related entries. This patch formalises this for most of the other inputs, except packages, which will be done soon. Closes: #634 Approved by: cgwalters
2017-02-15 20:41:38 +03:00
Add support for `deploy <version>` in `rojig://` mode This fleshes out an important piece of the story, showing that we can support history versioning the same way that we did with ostree. Also it's very useful for testing; I'm going to extend the suite after this to deploy the previous version, clean everything up, then upgrade and verify we only download changed RPMs. Closes: #1232 Approved by: jlebon
2018-02-06 22:03:22 +03:00
void
rojig-rename: API functions in core/origin, pruning refspec This renames the API functions in the core and origin, and also fixes up the fact that we were still looking for `jigdo/` refs in the pruning code. Closes: #1279 Approved by: jlebon
2018-02-27 23:05:44 +03:00
rpmostree_origin_set_rojig_version (RpmOstreeOrigin *origin,
Add support for `deploy <version>` in `rojig://` mode This fleshes out an important piece of the story, showing that we can support history versioning the same way that we did with ostree. Also it's very useful for testing; I'm going to extend the suite after this to deploy the previous version, clean everything up, then upgrade and verify we only download changed RPMs. Closes: #1232 Approved by: jlebon
2018-02-06 22:03:22 +03:00
const char *version);
upgrader: move origin mutation outside of the upgrader This is the beginning of a move towards making the upgrader more stateless and less hysteretic. Ideally, the only input required should be an origin file. Users of the upgrader are in charge of modifying the origin as needed. The main goal of this is to simplify the upgrader model and a better separation of concerns. This was already done for the initramfs-related entries. This patch formalises this for most of the other inputs, except packages, which will be done soon. Closes: #634 Approved by: cgwalters
2017-02-15 20:41:38 +03:00
gboolean
rpmostree_origin_set_rebase (RpmOstreeOrigin *origin,
const char *new_refspec,
GError **error);
rebase: Add support for "custom origin" descriptions We're looking to embed an ostree commit inside a container image, to make it easier to transport around with other images. Conceptually here the host system is tracking a container (just like for rojig we're tracking an RPM). This is the first step towards making that support nicer; tooling can do `rebase --custom-origin-url oscontainer://quay.io/exampleos@sha256:...` and have that show up in `rpm-ostree status`. There are two values, one intended to be machine readable (like the `ostree://` and `rojig://` and one for humans which we display when an admin types `rpm-ostree upgrade`. This builds on prior work in 27bd7b97bbef3b4c4b2ecd80a832d45e84f13932 from #1396 . Closes: #1406 Approved by: jlebon
2018-06-08 22:39:56 +03:00
gboolean
rpmostree_origin_set_rebase_custom (RpmOstreeOrigin *origin,
const char *new_refspec,
const char *custom_origin_url,
const char *custom_origin_description,
GError **error);
RpmOstreeOrigin: don't error on unconfigured state This is a follow-up to 775c781 (#626). Really, RpmOstreeOrigin shouldn't concern itself with whether the origin is unconfigured. Its main goal should be to parse it out and make it easy for users to modify it. That sort of business logic lives in the upgrader, which *should* be concerned if the origin in unconfigured. Closes: #634 Approved by: cgwalters
2017-02-16 20:46:13 +03:00
upgrader: switch to stateless model This is the culmination of the work paved by the previous commits. We no longer handle package set mutations in the upgrader, but rather let clients modify the origin as needed for that. As such, the upgrader is now completely memoryless. We no longer try to error out if a package is already in the base and we no longer drop out packages previously layered packages that are now in the base. *Which* packages actually get layered is determined during deployment and not coded in the origin. At an API level, the deployment variant returned (and thus what gets printed by `status --json`) now has both "packages" and "requested-packages". The former retains its original semantic: it's the set of packages that are *actually* layered. The latter contains everything from the origin, which includes the former set + dormant packages. Accordingly, the output of `rpm-ostree status` also now distinguishes between "RequestedPackages" and "LayeredPackages". Extra: we now quote provides that contain spaces. Closes: #646 Approved by: cgwalters
2017-02-24 17:44:40 +03:00
gboolean
rpmostree_origin_add_packages (RpmOstreeOrigin *origin,
char **packages,
PkgChange: add support for layering local RPMs Allow users to directly specify an RPM file on the command-line. The "packages_added" array of the PkgChange() method can now contain absolute paths to RPM files. Grow the origin format to have a new "requested-local" key. This is similar to the "requested" key, except that the packages are always installed from cache. The "requested-local" array values also embed the SHA-256 of the header we expect. There is now a new "LocalPackages" line in the status. These packages are a subset of the "packages" element (which are printed as "LayeredPackages") and represent the packages that are explicitly marked for installing from cache. Interesting design choices/notes: - Just as before, even with foo-1.0-1.x86_64 installed from RPM, a user can still request "/usr/bin/foo": it will be made dormant. As soon as foo stops being explicitly layered from the RPM, it will try to fulfill the request by going to the repos. This allows users to "pin" a layered package to a certain RPM, and then unpin it. - The strings/NEVRAs in "requested" and "requested-local" are strictly distinct. This allows us to be able to tell what the user means exactly when they do "rpm-ostree uninstall". Closes: #657 Approved by: cgwalters
2017-03-03 23:48:56 +03:00
gboolean local,
app/pkg-builtins: Add --idempotent Add a new `install/uninstall --idempotent` option to make it easier to interact with the CLI through scripts. E.g. one doesn't have to check first if a request has already been installed/uninstalled. Closes: #1467 Closes: #1478 Approved by: cgwalters
2018-07-30 22:10:50 +03:00
gboolean allow_existing,
gboolean *out_changed,
upgrader: switch to stateless model This is the culmination of the work paved by the previous commits. We no longer handle package set mutations in the upgrader, but rather let clients modify the origin as needed for that. As such, the upgrader is now completely memoryless. We no longer try to error out if a package is already in the base and we no longer drop out packages previously layered packages that are now in the base. *Which* packages actually get layered is determined during deployment and not coded in the origin. At an API level, the deployment variant returned (and thus what gets printed by `status --json`) now has both "packages" and "requested-packages". The former retains its original semantic: it's the set of packages that are *actually* layered. The latter contains everything from the origin, which includes the former set + dormant packages. Accordingly, the output of `rpm-ostree status` also now distinguishes between "RequestedPackages" and "LayeredPackages". Extra: we now quote provides that contain spaces. Closes: #646 Approved by: cgwalters
2017-02-24 17:44:40 +03:00
GError **error);
gboolean
origin: drop GCancellable arg and rename function 1. There's no point in passing a GCancellable in those cases. All the manipulations should be short-lived. 2. Rename delete_packages to remove_packages, since "remove" is the proper antonym of "add". Closes: #819 Approved by: cgwalters
2017-06-05 19:33:18 +03:00
rpmostree_origin_remove_packages (RpmOstreeOrigin *origin,
upgrader: switch to stateless model This is the culmination of the work paved by the previous commits. We no longer handle package set mutations in the upgrader, but rather let clients modify the origin as needed for that. As such, the upgrader is now completely memoryless. We no longer try to error out if a package is already in the base and we no longer drop out packages previously layered packages that are now in the base. *Which* packages actually get layered is determined during deployment and not coded in the origin. At an API level, the deployment variant returned (and thus what gets printed by `status --json`) now has both "packages" and "requested-packages". The former retains its original semantic: it's the set of packages that are *actually* layered. The latter contains everything from the origin, which includes the former set + dormant packages. Accordingly, the output of `rpm-ostree status` also now distinguishes between "RequestedPackages" and "LayeredPackages". Extra: we now quote provides that contain spaces. Closes: #646 Approved by: cgwalters
2017-02-24 17:44:40 +03:00
char **packages,
app/pkg-builtins: Add --idempotent Add a new `install/uninstall --idempotent` option to make it easier to interact with the CLI through scripts. E.g. one doesn't have to check first if a request has already been installed/uninstalled. Closes: #1467 Closes: #1478 Approved by: cgwalters
2018-07-30 22:10:50 +03:00
gboolean allow_noent,
gboolean *out_changed,
upgrader: switch to stateless model This is the culmination of the work paved by the previous commits. We no longer handle package set mutations in the upgrader, but rather let clients modify the origin as needed for that. As such, the upgrader is now completely memoryless. We no longer try to error out if a package is already in the base and we no longer drop out packages previously layered packages that are now in the base. *Which* packages actually get layered is determined during deployment and not coded in the origin. At an API level, the deployment variant returned (and thus what gets printed by `status --json`) now has both "packages" and "requested-packages". The former retains its original semantic: it's the set of packages that are *actually* layered. The latter contains everything from the origin, which includes the former set + dormant packages. Accordingly, the output of `rpm-ostree status` also now distinguishes between "RequestedPackages" and "LayeredPackages". Extra: we now quote provides that contain spaces. Closes: #646 Approved by: cgwalters
2017-02-24 17:44:40 +03:00
GError **error);
app/uninstall: Add --all switch to drop all layering This is one part of #1387 and is prep for a single higher level command that makes it easier to remove all customizations (layering *and* overrides). Closes: #1408 Approved by: cgwalters
2018-06-13 19:32:37 +03:00
gboolean
rpmostree_origin_remove_all_packages (RpmOstreeOrigin *origin,
gboolean *out_changed,
GError **error);
Introduce `ex livefs` There are a few different use cases here. First, for layering new packages, there's no good reason for us to force a reboot. Second, we want some support for cherry-picking security updates and allowing admins to restart services. Finally, at some point we should offer support for entirely replacing the running tree if that's what the user wants. Until now we've been very conservative, but there's a spectrum here. In particular, this patch changes things so we push a rollback before we start doing anything live. I think in practice, many use cases would be totally fine with doing most changes live, and falling back to the rollback if something went wrong. This initial code drop *only* supports live layering of new packages. However, a lot of the base infrastructure is laid for future work. For now, this will be classified as an experimental feature, hence `ex livefs`. Part of: https://github.com/projectatomic/rpm-ostree/issues/639 Closes: #652 Approved by: jlebon
2017-03-01 01:16:48 +03:00
app: support `ex override replace` for local RPMs Add experimental support for replacing packages from the base layer with local RPMs. This is useful for example, to cherry pick a fixed package, or to roll back to a previous package version. Like with pkg removals, only files in /usr are actually replaced. This patch also contains a few usability improvements as well, e.g. showing the full NEVRA of removed packages rather than just their names, and support for resetting overrides using either the pkgname or NEVRA. Closes: #852 Approved by: cgwalters
2017-07-04 20:50:52 +03:00
typedef enum {
/* RPMOSTREE_ORIGIN_OVERRIDE_REPLACE, */
RPMOSTREE_ORIGIN_OVERRIDE_REPLACE_LOCAL,
RPMOSTREE_ORIGIN_OVERRIDE_REMOVE
} RpmOstreeOriginOverrideType;
app: add experimental support for pkg removals This is one more step towards making rpm-ostree more powerful in its quest to be the ultimate *hybrid* image/package system. Package layering allows us to add packages on top of the base package set received from the content provider. However, we're not able to remove or replace packages in the base set itself. This patch introduces a new `override` command, which is for now nested under the experimental `ex` command. The `override` command will allow users to modify the base package set itself. The first implemented subcommands are `remove` and `reset`. A stub has been provided for the more useful `replace` subcommand, though much of the needed logic for that operation are implemented in this patch as part of the `remove` subcommand. Part of: https://github.com/projectatomic/rpm-ostree/issues/485 Closes: #797 Approved by: cgwalters
2017-06-05 19:37:56 +03:00
gboolean
rpmostree_origin_add_overrides (RpmOstreeOrigin *origin,
char **packages,
app: support `ex override replace` for local RPMs Add experimental support for replacing packages from the base layer with local RPMs. This is useful for example, to cherry pick a fixed package, or to roll back to a previous package version. Like with pkg removals, only files in /usr are actually replaced. This patch also contains a few usability improvements as well, e.g. showing the full NEVRA of removed packages rather than just their names, and support for resetting overrides using either the pkgname or NEVRA. Closes: #852 Approved by: cgwalters
2017-07-04 20:50:52 +03:00
RpmOstreeOriginOverrideType type,
app: add experimental support for pkg removals This is one more step towards making rpm-ostree more powerful in its quest to be the ultimate *hybrid* image/package system. Package layering allows us to add packages on top of the base package set received from the content provider. However, we're not able to remove or replace packages in the base set itself. This patch introduces a new `override` command, which is for now nested under the experimental `ex` command. The `override` command will allow users to modify the base package set itself. The first implemented subcommands are `remove` and `reset`. A stub has been provided for the more useful `replace` subcommand, though much of the needed logic for that operation are implemented in this patch as part of the `remove` subcommand. Part of: https://github.com/projectatomic/rpm-ostree/issues/485 Closes: #797 Approved by: cgwalters
2017-06-05 19:37:56 +03:00
GError **error);
gboolean
app: support `ex override replace` for local RPMs Add experimental support for replacing packages from the base layer with local RPMs. This is useful for example, to cherry pick a fixed package, or to roll back to a previous package version. Like with pkg removals, only files in /usr are actually replaced. This patch also contains a few usability improvements as well, e.g. showing the full NEVRA of removed packages rather than just their names, and support for resetting overrides using either the pkgname or NEVRA. Closes: #852 Approved by: cgwalters
2017-07-04 20:50:52 +03:00
rpmostree_origin_remove_override (RpmOstreeOrigin *origin,
const char *package,
RpmOstreeOriginOverrideType type);
app: add experimental support for pkg removals This is one more step towards making rpm-ostree more powerful in its quest to be the ultimate *hybrid* image/package system. Package layering allows us to add packages on top of the base package set received from the content provider. However, we're not able to remove or replace packages in the base set itself. This patch introduces a new `override` command, which is for now nested under the experimental `ex` command. The `override` command will allow users to modify the base package set itself. The first implemented subcommands are `remove` and `reset`. A stub has been provided for the more useful `replace` subcommand, though much of the needed logic for that operation are implemented in this patch as part of the `remove` subcommand. Part of: https://github.com/projectatomic/rpm-ostree/issues/485 Closes: #797 Approved by: cgwalters
2017-06-05 19:37:56 +03:00
gboolean
rpmostree_origin_remove_all_overrides (RpmOstreeOrigin *origin,
gboolean *out_changed,
GError **error);
tree-wide: Add extern "C" wrapping to our headers Prep for (potentially) using https://cxx.rs We want our header files to be includable in C++.
2020-11-23 03:22:52 +03:00
G_END_DECLS
Reference in New Issue Copy Permalink