2017-01-19 14:23:30 +03:00
# This file is to be sourced, not executed
2012-09-15 20:44:57 +04:00
# Copyright (C) 2011 Colin Walters <walters@verbum.org>
#
2018-01-30 22:26:26 +03:00
# SPDX-License-Identifier: LGPL-2.0+
#
2012-09-15 20:44:57 +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.
#
# 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
2021-12-07 04:20:55 +03:00
# License along with this library. If not, see <https://www.gnu.org/licenses/>.
2012-09-15 20:44:57 +04:00
2016-01-27 19:44:10 +03:00
set -euo pipefail
2012-09-15 20:44:57 +04:00
$OSTREE checkout test2 checkout-test2
echo "ok checkout"
cd checkout-test2
assert_has_file firstfile
assert_has_file baz/cow
assert_file_has_content baz/cow moo
assert_has_file baz/deeper/ohyeah
echo "ok content"
cd ${ test_tmpdir }
mkdir repo2
2017-03-24 17:35:59 +03:00
ostree_repo_init repo2
2012-09-15 20:44:57 +04:00
${ CMD_PREFIX } ostree --repo= repo2 pull-local repo
echo "ok local clone"
cd ${ test_tmpdir }
${ CMD_PREFIX } ostree --repo= repo2 checkout test2 test2-checkout-from-local-clone
cd test2-checkout-from-local-clone
assert_file_has_content baz/cow moo
2013-07-02 06:35:54 +04:00
cd ${ test_tmpdir }
rm repo2 -rf
2012-09-15 20:44:57 +04:00
echo "ok local clone checkout"
$OSTREE checkout -U test2 checkout-user-test2
echo "ok user checkout"
cd ${ test_tmpdir } /checkout-test2
$OSTREE commit -b test2-uid0 -s 'UID 0 test' --owner-uid= 0 --owner-gid= 0
echo "ok uid0 commit"
cd ${ test_tmpdir }
$OSTREE ls test2-uid0 /firstfile > uid0-ls-output.txt
2013-05-02 02:43:01 +04:00
assert_file_has_content uid0-ls-output.txt "-006[64]4 0 0 6 /firstfile"
2012-09-15 20:44:57 +04:00
echo "ok uid0 ls"
$OSTREE checkout -U test2-uid0 checkout-user-test2-uid0
echo "ok user checkout from uid 0"
cd ${ test_tmpdir }
$OSTREE cat test2 /baz/cow > cow-contents
assert_file_has_content cow-contents "moo"
echo "ok cat-file"
cd ${ test_tmpdir }
$OSTREE fsck
echo "ok fsck"
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
mkdir -p test-overlays
date > test-overlays/overlaid-file
$OSTREE commit ${ COMMIT_ARGS } -b test-base --base test2 --owner-uid 42 --owner-gid 42 test-overlays/
$OSTREE ls -R test-base > ls.txt
2022-09-19 18:15:24 +03:00
if can_create_whiteout_devices; then
2023-09-29 19:09:04 +03:00
assert_streq " $( wc -l < ls.txt) " 22
2022-09-19 18:15:24 +03:00
else
2023-09-29 19:09:04 +03:00
assert_streq " $( wc -l < ls.txt) " 19
2022-09-19 18:15:24 +03:00
fi
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
assert_streq " $( grep '42.*42' ls.txt | wc -l) " 2
echo "ok commit overlay base"