From 12d0625bad7adbea9b20d5278df82daf9d89e227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Wed, 28 Apr 2021 14:39:44 +0200 Subject: [PATCH] libzfs: drop on merge! or come up with something better MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ahelenia Ziemiańska --- .../functional/cli_root/zfs_load-key/zfs_load-key_all.ksh | 2 +- .../functional/cli_root/zfs_load-key/zfs_load-key_https.ksh | 6 +++--- .../cli_root/zfs_load-key/zfs_load-key_location.ksh | 2 +- .../cli_root/zfs_load-key/zfs_load-key_recursive.ksh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_all.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_all.ksh index 3f377890caec..30dde4de8299 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_all.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_all.ksh @@ -56,7 +56,7 @@ log_must zfs create -o encryption=on -o keyformat=passphrase \ [ -n "$net" ] && \ log_must zfs create -o encryption=on -o keyformat=passphrase \ - -o keylocation=https://raw.githubusercontent.com/openzfs/zfs/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS2 + -o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS2 log_must zfs create -V 64M -o encryption=on -o keyformat=passphrase \ -o keylocation=file:///$TESTPOOL/pkey $TESTPOOL/zvol diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_https.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_https.ksh index fa8d36a0a13f..b540d96e3720 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_https.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_https.ksh @@ -54,13 +54,13 @@ log_mustnot zfs create -o encryption=on -o keyformat=passphrase \ -o keylocation=https://github.com/openzfs/nonexistent-repository $TESTPOOL/$TESTFS1 log_must zfs create -o encryption=on -o keyformat=passphrase \ - -o keylocation=https://raw.githubusercontent.com/openzfs/zfs/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1 + -o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1 log_must zfs create -o encryption=on -o keyformat=hex \ - -o keylocation=https://raw.githubusercontent.com/openzfs/zfs/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/HEXKEY $TESTPOOL/$TESTFS2 + -o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/HEXKEY $TESTPOOL/$TESTFS2 log_must zfs create -o encryption=on -o keyformat=raw \ - -o keylocation=https://raw.githubusercontent.com/openzfs/zfs/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/RAWKEY $TESTPOOL/$TESTFS3 + -o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/RAWKEY $TESTPOOL/$TESTFS3 for fs in "$TESTFS1" "$TESTFS2" "$TESTFS3"; do log_must zfs unmount $TESTPOOL/$fs diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_location.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_location.ksh index 8bf3e7275e8a..1c19009aca96 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_location.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_location.ksh @@ -72,7 +72,7 @@ log_must verify_keylocation $TESTPOOL/$TESTFS1 "file://$key_location" if has_network; then log_must zfs unload-key $TESTPOOL/$TESTFS1 - log_must zfs load-key -L https://raw.githubusercontent.com/openzfs/zfs/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1 + log_must zfs load-key -L https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1 log_must key_available $TESTPOOL/$TESTFS1 log_must verify_keylocation $TESTPOOL/$TESTFS1 "file://$key_location" fi diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_recursive.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_recursive.ksh index ec7ec91731ce..a5866445840a 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_recursive.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_recursive.ksh @@ -56,7 +56,7 @@ log_must zfs create -o keyformat=passphrase \ [ -n "$net" ] && \ log_must zfs create -o keyformat=passphrase \ - -o keylocation=https://raw.githubusercontent.com/openzfs/zfs/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1/child/child + -o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1/child/child log_must zfs unmount $TESTPOOL/$TESTFS1 [ -n "$net" ] && log_must zfs unload-key $TESTPOOL/$TESTFS1/child/child