From: Yu Watanabe Date: Tue, 1 Apr 2025 09:58:43 +0000 (+0900) Subject: Revert "test: call nvme-cli with --hostnqn= instead of the deprecated --hostid=" X-Git-Tag: v258-rc1~971^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=699c377d0d363ab2114bc10c16a01189c8d66769;p=thirdparty%2Fsystemd.git Revert "test: call nvme-cli with --hostnqn= instead of the deprecated --hostid=" This reverts commit b8942f4ae2d121603544b8527a7faf7fc458562c. As commented https://github.com/systemd/systemd/issues/36908#issuecomment-2768507373, the usage of --hostnqn= is different from --hostid=. --- diff --git a/test/units/TEST-84-STORAGETM.sh b/test/units/TEST-84-STORAGETM.sh index 0ae98a4c320..db281963b26 100755 --- a/test/units/TEST-84-STORAGETM.sh +++ b/test/units/TEST-84-STORAGETM.sh @@ -24,7 +24,7 @@ NVME_UUID="$(cat /proc/sys/kernel/random/uuid)" systemd-run -u teststoragetm.service -p Type=notify -p "Environment=SYSTEMD_NVME_UUID=${NVME_UUID:?}" /usr/lib/systemd/systemd-storagetm /var/tmp/storagetm.test --nqn=quux NVME_DEVICE="/dev/disk/by-id/nvme-uuid.${NVME_UUID:?}" -nvme connect-all -vv -t tcp -a 127.0.0.1 -s 16858 --hostnqn="$(cat /proc/sys/kernel/random/uuid)" +nvme connect-all -vv -t tcp -a 127.0.0.1 -s 16858 --hostid="$(cat /proc/sys/kernel/random/uuid)" udevadm wait --settle "$NVME_DEVICE" dd if="$NVME_DEVICE" bs=1024 | cmp /var/tmp/storagetm.test -