f37426f1ad
I'd like to add a new `boot-location: modules`. In prep
for that, let's remove the legacy `both` which drops into
`/boot`.
The libostree support for handling `/usr/lib/ostree-boot` has
existed for over 4 years:
```
commit 37a059925f6b96d30190b65bee6bdde0ae1c6915
Commit: Colin Walters <walters@verbum.org>
CommitDate: Sun Nov 30 23:14:05 2014 -0500
deploy: Ensure that we can deploy using only /usr/lib/ostree-boot
```
I think we assume now that no one is now making *new* treecomposes and needs
a newer rpm-ostree and that they expect people to be able to use as an
upgrade target from a libostree that predates that.
Closes: #1773
Approved by: jlebon
49 lines
2.0 KiB
Bash
Executable File
49 lines
2.0 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -xeuo pipefail
|
|
|
|
dn=$(cd $(dirname $0) && pwd)
|
|
. ${dn}/libcomposetest.sh
|
|
|
|
prepare_compose_test "installroot"
|
|
# This is used to test postprocessing with treefile vs not
|
|
pysetjsonmember "boot_location" '"new"'
|
|
instroot_tmp=$(mktemp -d /var/tmp/rpm-ostree-instroot.XXXXXX)
|
|
rpm-ostree compose install --unified-core --repo="${repobuild}" ${treefile} ${instroot_tmp}
|
|
instroot=${instroot_tmp}/rootfs
|
|
assert_not_has_dir ${instroot}/etc
|
|
test -L ${instroot}/home
|
|
assert_has_dir ${instroot}/usr/etc
|
|
|
|
# Clone the root - we'll test direct commit, as well as postprocess with
|
|
# and without treefile.
|
|
mv ${instroot}{,-postprocess}
|
|
cp -al ${instroot}{-postprocess,-directcommit}
|
|
cp -al ${instroot}{-postprocess,-postprocess-treefile}
|
|
|
|
integrationconf=usr/lib/tmpfiles.d/rpm-ostree-0-integration.conf
|
|
|
|
assert_not_has_file ${instroot}-postprocess/${integrationconf}
|
|
rpm-ostree compose postprocess ${instroot}-postprocess
|
|
assert_has_file ${instroot}-postprocess/${integrationconf}
|
|
ostree --repo=${repobuild} commit -b test-directcommit --selinux-policy ${instroot}-postprocess --tree=dir=${instroot}-postprocess
|
|
echo "ok postprocess + direct commit"
|
|
|
|
rpm-ostree compose postprocess ${instroot}-postprocess-treefile ${treefile}
|
|
assert_has_file ${instroot}-postprocess-treefile/${integrationconf}
|
|
# with treefile, no kernels in /boot
|
|
ls ${instroot}-postprocess-treefile/boot > ls.txt
|
|
assert_not_file_has_content ls.txt '^vmlinuz-'
|
|
rm -f ls.txt
|
|
echo "ok postprocess with treefile"
|
|
|
|
testdate=$(date)
|
|
echo "${testdate}" > ${instroot}-directcommit/usr/share/rpm-ostree-composetest-split.txt
|
|
assert_not_has_file ${instroot}-directcommit/${integrationconf}
|
|
rpm-ostree compose commit --repo=${repobuild} ${treefile} ${instroot}-directcommit
|
|
ostree --repo=${repobuild} ls ${treeref} /usr/bin/bash
|
|
ostree --repo=${repobuild} cat ${treeref} /usr/share/rpm-ostree-composetest-split.txt >out.txt
|
|
assert_file_has_content_literal out.txt "${testdate}"
|
|
ostree --repo=${repobuild} cat ${treeref} /${integrationconf}
|
|
echo "ok installroot"
|