mirror of
https://github.com/systemd/systemd
synced 2024-10-14 20:17:52 +00:00
test: rename service used in TEST-29-PORTABLE to avoid conflict
There's an app0.service in the extension app0.raw, so don't use the same name for a unit in minimal.raw
This commit is contained in:
parent
2a97a4b374
commit
d76f0de746
|
@ -598,17 +598,21 @@ install_verity_minimal() {
|
||||||
touch "$initdir/etc/machine-id" "$initdir/etc/resolv.conf"
|
touch "$initdir/etc/machine-id" "$initdir/etc/resolv.conf"
|
||||||
touch "$initdir/opt/some_file"
|
touch "$initdir/opt/some_file"
|
||||||
echo MARKER=1 >>"$initdir/usr/lib/os-release"
|
echo MARKER=1 >>"$initdir/usr/lib/os-release"
|
||||||
echo "PORTABLE_PREFIXES=app0 minimal" >>"$initdir/usr/lib/os-release"
|
echo "PORTABLE_PREFIXES=app0 minimal minimal-app0" >>"$initdir/usr/lib/os-release"
|
||||||
echo -e "[Service]\nExecStartPre=cat /usr/lib/os-release\nExecStart=sleep 120" >"$initdir/usr/lib/systemd/system/app0.service"
|
cat >"$initdir/usr/lib/systemd/system/minimal-app0.service" <<EOF
|
||||||
cp "$initdir/usr/lib/systemd/system/app0.service" "$initdir/usr/lib/systemd/system/app0-foo.service"
|
[Service]
|
||||||
|
ExecStartPre=cat /usr/lib/os-release
|
||||||
|
ExecStart=sleep 120
|
||||||
|
EOF
|
||||||
|
cp "$initdir/usr/lib/systemd/system/minimal-app0.service" "$initdir/usr/lib/systemd/system/minimal-app0-foo.service"
|
||||||
|
|
||||||
mksquashfs "$initdir" "$oldinitdir/usr/share/minimal_0.raw"
|
mksquashfs "$initdir" "$oldinitdir/usr/share/minimal_0.raw"
|
||||||
veritysetup format "$oldinitdir/usr/share/minimal_0.raw" "$oldinitdir/usr/share/minimal_0.verity" | \
|
veritysetup format "$oldinitdir/usr/share/minimal_0.raw" "$oldinitdir/usr/share/minimal_0.verity" | \
|
||||||
grep '^Root hash:' | cut -f2 | tr -d '\n' >"$oldinitdir/usr/share/minimal_0.roothash"
|
grep '^Root hash:' | cut -f2 | tr -d '\n' >"$oldinitdir/usr/share/minimal_0.roothash"
|
||||||
|
|
||||||
sed -i "s/MARKER=1/MARKER=2/g" "$initdir/usr/lib/os-release"
|
sed -i "s/MARKER=1/MARKER=2/g" "$initdir/usr/lib/os-release"
|
||||||
rm "$initdir/usr/lib/systemd/system/app0-foo.service"
|
rm "$initdir/usr/lib/systemd/system/minimal-app0-foo.service"
|
||||||
cp "$initdir/usr/lib/systemd/system/app0.service" "$initdir/usr/lib/systemd/system/app0-bar.service"
|
cp "$initdir/usr/lib/systemd/system/minimal-app0.service" "$initdir/usr/lib/systemd/system/minimal-app0-bar.service"
|
||||||
|
|
||||||
mksquashfs "$initdir" "$oldinitdir/usr/share/minimal_1.raw"
|
mksquashfs "$initdir" "$oldinitdir/usr/share/minimal_1.raw"
|
||||||
veritysetup format "$oldinitdir/usr/share/minimal_1.raw" "$oldinitdir/usr/share/minimal_1.verity" | \
|
veritysetup format "$oldinitdir/usr/share/minimal_1.raw" "$oldinitdir/usr/share/minimal_1.verity" | \
|
||||||
|
|
|
@ -24,29 +24,29 @@ cat <<EOF >/run/systemd/system/systemd-portabled.service.d/override.conf
|
||||||
Environment=SYSTEMD_LOG_LEVEL=debug
|
Environment=SYSTEMD_LOG_LEVEL=debug
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
portablectl "${ARGS[@]}" attach --now --runtime /usr/share/minimal_0.raw app0
|
portablectl "${ARGS[@]}" attach --now --runtime /usr/share/minimal_0.raw minimal-app0
|
||||||
|
|
||||||
systemctl is-active app0.service
|
systemctl is-active minimal-app0.service
|
||||||
systemctl is-active app0-foo.service
|
systemctl is-active minimal-app0-foo.service
|
||||||
set +o pipefail
|
set +o pipefail
|
||||||
set +e
|
set +e
|
||||||
systemctl is-active app0-bar.service && exit 1
|
systemctl is-active minimal-app0-bar.service && exit 1
|
||||||
set -e
|
set -e
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
portablectl "${ARGS[@]}" reattach --now --runtime /usr/share/minimal_1.raw app0
|
portablectl "${ARGS[@]}" reattach --now --runtime /usr/share/minimal_1.raw minimal-app0
|
||||||
|
|
||||||
systemctl is-active app0.service
|
systemctl is-active minimal-app0.service
|
||||||
systemctl is-active app0-bar.service
|
systemctl is-active minimal-app0-bar.service
|
||||||
set +o pipefail
|
set +o pipefail
|
||||||
set +e
|
set +e
|
||||||
systemctl is-active app0-foo.service && exit 1
|
systemctl is-active minimal-app0-foo.service && exit 1
|
||||||
set -e
|
set -e
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
portablectl list | grep -q -F "minimal_1"
|
portablectl list | grep -q -F "minimal_1"
|
||||||
|
|
||||||
portablectl detach --now --runtime /usr/share/minimal_1.raw app0
|
portablectl detach --now --runtime /usr/share/minimal_1.raw minimal-app0
|
||||||
|
|
||||||
portablectl list | grep -q -F "No images."
|
portablectl list | grep -q -F "No images."
|
||||||
|
|
||||||
|
@ -55,29 +55,29 @@ portablectl list | grep -q -F "No images."
|
||||||
unsquashfs -dest /tmp/minimal_0 /usr/share/minimal_0.raw
|
unsquashfs -dest /tmp/minimal_0 /usr/share/minimal_0.raw
|
||||||
unsquashfs -dest /tmp/minimal_1 /usr/share/minimal_1.raw
|
unsquashfs -dest /tmp/minimal_1 /usr/share/minimal_1.raw
|
||||||
|
|
||||||
portablectl "${ARGS[@]}" attach --copy=symlink --now --runtime /tmp/minimal_0 app0
|
portablectl "${ARGS[@]}" attach --copy=symlink --now --runtime /tmp/minimal_0 minimal-app0
|
||||||
|
|
||||||
systemctl is-active app0.service
|
systemctl is-active minimal-app0.service
|
||||||
systemctl is-active app0-foo.service
|
systemctl is-active minimal-app0-foo.service
|
||||||
set +o pipefail
|
set +o pipefail
|
||||||
set +e
|
set +e
|
||||||
systemctl is-active app0-bar.service && exit 1
|
systemctl is-active minimal-app0-bar.service && exit 1
|
||||||
set -e
|
set -e
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
portablectl "${ARGS[@]}" reattach --now --enable --runtime /tmp/minimal_1 app0
|
portablectl "${ARGS[@]}" reattach --now --enable --runtime /tmp/minimal_1 minimal-app0
|
||||||
|
|
||||||
systemctl is-active app0.service
|
systemctl is-active minimal-app0.service
|
||||||
systemctl is-active app0-bar.service
|
systemctl is-active minimal-app0-bar.service
|
||||||
set +o pipefail
|
set +o pipefail
|
||||||
set +e
|
set +e
|
||||||
systemctl is-active app0-foo.service && exit 1
|
systemctl is-active minimal-app0-foo.service && exit 1
|
||||||
set -e
|
set -e
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
portablectl list | grep -q -F "minimal_1"
|
portablectl list | grep -q -F "minimal_1"
|
||||||
|
|
||||||
portablectl detach --now --enable --runtime /tmp/minimal_1 app0
|
portablectl detach --now --enable --runtime /tmp/minimal_1 minimal-app0
|
||||||
|
|
||||||
portablectl list | grep -q -F "No images."
|
portablectl list | grep -q -F "No images."
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue