2011-10-28 18:25:36 +04:00
#!/bin/bash
#
# Copyright (C) 2011 Colin Walters <walters@verbum.org>
#
2018-01-30 22:26:26 +03:00
# SPDX-License-Identifier: LGPL-2.0+
#
2011-11-10 22:17:04 +04:00
# This library 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 License, or (at your option) any later version.
2011-10-28 18:25:36 +04:00
#
2011-11-10 22:17:04 +04:00
# This library is distributed in the hope that it will be useful,
2011-10-28 18:25:36 +04:00
# but WITHOUT ANY WARRANTY; without even the implied warranty of
2011-11-10 22:17:04 +04:00
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
2011-10-28 18:25:36 +04:00
#
2011-11-10 22:17:04 +04:00
# You should have received a copy of the GNU Lesser General Public
2021-12-07 04:20:55 +03:00
# License along with this library. If not, see <https://www.gnu.org/licenses/>.
2011-10-28 18:25:36 +04:00
2016-01-27 19:44:10 +03:00
set -euo pipefail
2011-10-28 18:25:36 +04:00
2013-05-01 23:26:21 +04:00
. $( dirname $0 ) /libtest.sh
2011-10-28 18:25:36 +04:00
commit: Add --base argument
I was trying to followup the `--selinux-policy-from-base` work
to add a `cosa build --fast=overlay` for coreos-assembler,
but hit on the fact that using e.g. `--owner-uid` disables
commit optimizations.
A while ago, https://github.com/ostreedev/ostree/pull/1643 landed
which optimized this for the case where no modifications are provided.
But, we really need the SELinux policy bits, and it's super convenient
to run `ostree commit` as non-root.
It's fairly surprising actually that it's taken us so long to
iterate on a good interface for this "commit changes on top of a base"
model. In practice, many nontrivial cases really end up needing
to do a (hardlink) checkout, and that case is optimized.
But for this coreos-assembler work I want to directly overlay onto
a commit object another commit object.
That previous PR above added exactly the API we need, so let's
expose it in the CLI.
What you can see happening in the test is that we provide
`--owner-uid 42`, but that only applies to directories/files
that were added in the commit.
And now that I look at this, I think what we really want here
is to avoid changing directories that exist in the base, but
eh; in practice the main use here is for `--owner-uid 0` while
committing as non-root; and that works fine with this since
the baseline uid will be zero as well.
2020-04-06 01:23:39 +03:00
echo '1..13'
2011-10-28 18:25:36 +04:00
2017-09-01 23:15:33 +03:00
setup_test_repository "archive"
2012-09-15 20:44:57 +04:00
2016-03-31 20:29:44 +03:00
. ${ test_srcdir } /archive-test.sh
2013-07-02 19:24:07 +04:00
2017-09-01 23:15:33 +03:00
${ CMD_PREFIX } ostree --repo= repo-archive-z2 init --mode= archive-z2
echo "ok did an init with archive-z2 alias"
2013-07-02 19:24:07 +04:00
cd ${ test_tmpdir }
mkdir repo2
2017-03-24 17:35:59 +03:00
ostree_repo_init repo2
2013-09-05 22:50:36 +04:00
${ CMD_PREFIX } ostree --repo= repo2 remote add --set= gpg-verify= false aremote file://$( pwd ) /repo test2
2015-11-09 15:03:35 +03:00
${ CMD_PREFIX } ostree --repo= repo2 pull aremote
${ CMD_PREFIX } ostree --repo= repo2 rev-parse aremote/test2
${ CMD_PREFIX } ostree --repo= repo2 fsck
2013-07-02 19:24:07 +04:00
echo "ok pull with from file:/// uri"