Skip to content

Commit

Permalink
manifest: Enable cliwrap
Browse files Browse the repository at this point in the history
This functionality has been around for quite a while in rpm-ostree
but I'm not aware of anyone using it.  I'd like to turn it
on here so we can gain the benefits, which right now are
better protection against non-ostree-aware commands run as
root (`rpm` and `dracut` namely).

A bit more in coreos/rpm-ostree#1789
  • Loading branch information
cgwalters committed Feb 18, 2021
1 parent 659a3cf commit 46151a3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
3 changes: 3 additions & 0 deletions manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ default-target: multi-user.target
# we can drop this when it's the rpm-ostree default
rpmdb: sqlite

# See the treefile docs
cliwrap: true

# ⚠⚠⚠ ONLY TEMPORARY HACKS ALLOWED HERE; ALL ENTRIES NEED TRACKER LINKS ⚠⚠⚠
# See also the version of this in fedora-coreos.yaml
postprocess:
Expand Down
6 changes: 6 additions & 0 deletions tests/kola/misc-ro
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ if [ ! -f /usr/share/rpm/rpmdb.sqlite ]; then
fi
ok rpmdb is sqlite

if dracut 2>err.txt; then
fatal "ran dracut"
grep -q 'rpm-ostree initramfs' err.txt
fi
echo "ok rpm-ostree cliwrap"

# make sure we don't default to having swap on zram
# https://github.com/coreos/fedora-coreos-tracker/issues/509
# https://github.com/coreos/fedora-coreos-config/pull/687
Expand Down

0 comments on commit 46151a3

Please sign in to comment.