mirror of
https://github.com/systemd/systemd
synced 2024-09-06 16:56:43 +00:00
test: pre-assemble minimal image for TEST-50-DISSECT at build time
Easier than in the limited VM environment
This commit is contained in:
parent
a5f1d665d7
commit
0f5d24a8b9
|
@ -28,11 +28,24 @@ test_create_image() {
|
|||
instmods dm_verity =md
|
||||
install_dmevent
|
||||
generate_module_dependencies
|
||||
inst_binary md5sum
|
||||
inst_binary mksquashfs
|
||||
inst_binary veritysetup
|
||||
inst_binary sfdisk
|
||||
inst_binary losetup
|
||||
|
||||
BASICTOOLS=(
|
||||
bash
|
||||
cat
|
||||
)
|
||||
oldinitdir=$initdir
|
||||
export initdir=$TESTDIR/minimal
|
||||
mkdir -p $initdir
|
||||
setup_basic_dirs
|
||||
install_basic_tools
|
||||
inst /usr/lib/os-release
|
||||
ln -s ../usr/lib/os-release $initdir/etc/os-release
|
||||
echo MARKER=1 >> $initdir/usr/lib/os-release
|
||||
mksquashfs $initdir $oldinitdir/usr/share/minimal.raw
|
||||
veritysetup format $oldinitdir/usr/share/minimal.raw $oldinitdir/usr/share/minimal.verity | grep '^Root hash:' | cut -f2 | tr -d '\n' > $oldinitdir/usr/share/minimal.roothash
|
||||
export initdir=$oldinitdir
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -22,31 +22,27 @@ fi
|
|||
|
||||
trap cleanup EXIT
|
||||
|
||||
image="${image_dir}/img"
|
||||
mkdir -p ${image}/usr/lib ${image}/etc
|
||||
cp /usr/lib/os-release ${image}/usr/lib/
|
||||
cp /etc/machine-id /etc/os-release ${image}/etc/
|
||||
mksquashfs ${image} ${image}.raw
|
||||
veritysetup format ${image}.raw ${image}.verity | grep '^Root hash:' | cut -f2 | tr -d '\n' > ${image}.roothash
|
||||
cp /usr/share/minimal.* "${image_dir}/"
|
||||
image="${image_dir}/minimal"
|
||||
roothash="$(cat ${image}.roothash)"
|
||||
|
||||
/usr/lib/systemd/systemd-dissect ${image}.raw | grep -q -F "Found read-only 'root' partition of type squashfs with verity"
|
||||
/usr/lib/systemd/systemd-dissect ${image}.raw | grep -q -F "MARKER=1"
|
||||
/usr/lib/systemd/systemd-dissect ${image}.raw | grep -q -F -f /usr/lib/os-release
|
||||
|
||||
mv ${image}.verity ${image}.fooverity
|
||||
mv ${image}.roothash ${image}.foohash
|
||||
/usr/lib/systemd/systemd-dissect ${image}.raw --root-hash=${roothash} --verity-data=${image}.fooverity | grep -q -F "Found read-only 'root' partition of type squashfs with verity"
|
||||
/usr/lib/systemd/systemd-dissect ${image}.raw --root-hash=${roothash} --verity-data=${image}.fooverity | grep -q -F "MARKER=1"
|
||||
/usr/lib/systemd/systemd-dissect ${image}.raw --root-hash=${roothash} --verity-data=${image}.fooverity | grep -q -F -f /usr/lib/os-release
|
||||
mv ${image}.fooverity ${image}.verity
|
||||
mv ${image}.foohash ${image}.roothash
|
||||
|
||||
mkdir -p ${image_dir}/mount
|
||||
/usr/lib/systemd/systemd-dissect --mount ${image}.raw ${image_dir}/mount
|
||||
pushd ${image_dir}/mount/etc/
|
||||
(cd /etc; md5sum os-release) | md5sum -c
|
||||
cd ../usr/lib
|
||||
(cd /usr/lib; md5sum os-release) | md5sum -c
|
||||
popd
|
||||
cat ${image_dir}/mount/usr/lib/os-release | grep -q -F -f /usr/lib/os-release
|
||||
cat ${image_dir}/mount/etc/os-release | grep -q -F -f /usr/lib/os-release
|
||||
cat ${image_dir}/mount/usr/lib/os-release | grep -q -F "MARKER=1"
|
||||
umount ${image_dir}/mount
|
||||
|
||||
# Make a GPT disk on the fly, with the squashfs as partition 1 and the verity hash tree as partition 2
|
||||
|
@ -93,14 +89,13 @@ losetup -d ${loop}
|
|||
|
||||
/usr/lib/systemd/systemd-dissect --root-hash ${roothash} ${image}.gpt | grep -q "Found read-only 'root' partition (UUID $(head -c 32 ${image}.roothash)) of type squashfs for .* with verity on partition #1"
|
||||
/usr/lib/systemd/systemd-dissect --root-hash ${roothash} ${image}.gpt | grep -q "Found read-only 'root-verity' partition (UUID $(tail -c 32 ${image}.roothash)) of type DM_verity_hash for .* on partition #2"
|
||||
/usr/lib/systemd/systemd-dissect --root-hash ${roothash} ${image}.gpt | grep -q -F "MARKER=1"
|
||||
/usr/lib/systemd/systemd-dissect --root-hash ${roothash} ${image}.gpt | grep -q -F -f /usr/lib/os-release
|
||||
|
||||
/usr/lib/systemd/systemd-dissect --root-hash ${roothash} --mount ${image}.gpt ${image_dir}/mount
|
||||
pushd ${image_dir}/mount/etc/
|
||||
(cd /etc; md5sum os-release) | md5sum -c
|
||||
cd ../usr/lib
|
||||
(cd /usr/lib; md5sum os-release) | md5sum -c
|
||||
popd
|
||||
cat ${image_dir}/mount/usr/lib/os-release | grep -q -F -f /usr/lib/os-release
|
||||
cat ${image_dir}/mount/etc/os-release | grep -q -F -f /usr/lib/os-release
|
||||
cat ${image_dir}/mount/usr/lib/os-release | grep -q -F "MARKER=1"
|
||||
umount ${image_dir}/mount
|
||||
|
||||
echo OK > /testok
|
||||
|
|
Loading…
Reference in a new issue