Skip to content

Commit

Permalink
Add support for rpm-ostree deploy --ex-cliwrap=true
Browse files Browse the repository at this point in the history
This is a better alternative to coreos/fedora-coreos-config#830

Basically rather than trying to send this out to all FCOS users,
it's much saner to allow people to opt-in to it locally.

If we'd finished coreos#2326
then this would be something as trivial as:
```
$ echo 'cliwrap: true' > /etc/rpm-ostree.d/cliwrap.yaml
$ rpm-ostree rebuild
```

Unfortunately that's not the world we live in, so a whole lot of
layers here need crossing to just propagate a boolean.  And it
interacts in a tricky way with our change detection code.

But, it works and will allow people to try this out.

Other fixed problems:

- Our `rpm --verify` wrapping was broken
- Dropping privileges clashed with the default directory being `/root`,
  so `chdir(/)` too
  • Loading branch information
cgwalters committed May 19, 2021
1 parent d40434d commit d20ace9
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/daemon/rpmostree-sysroot-upgrader.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ struct RpmOstreeSysrootUpgrader {

gboolean layering_initialized; /* Whether layering_type is known */
RpmOstreeSysrootUpgraderLayeringType layering_type;
gboolean cal_assembly; /* True if the txn knows that something changed, e.g. cliwrap */
gboolean layering_changed; /* Whether changes to layering should result in a new commit */
gboolean pkgs_imported; /* Whether pkgs to be layered have been downloaded & imported */
char *base_revision; /* Non-layered replicated commit */
Expand Down

0 comments on commit d20ace9

Please sign in to comment.