Skip to content

Commit 5e64ad0

Browse files
libzfs: drop on merge! or come up with something better
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
1 parent 40ebabc commit 5e64ad0

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_all.ksh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ log_must zfs create -o encryption=on -o keyformat=passphrase \
5353
-o keylocation=file:///$TESTPOOL/pkey $TESTPOOL/$TESTFS1
5454

5555
log_must zfs create -o encryption=on -o keyformat=passphrase \
56-
-o keylocation=https://github.com/openzfs/zfs/raw/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS2
56+
-o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS2
5757

5858
log_must zfs create -V 64M -o encryption=on -o keyformat=passphrase \
5959
-o keylocation=file:///$TESTPOOL/pkey $TESTPOOL/zvol

tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_https.ksh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ log_onexit cleanup
4343
log_assert "'zfs load-key' should load a key from a file"
4444

4545
log_must zfs create -o encryption=on -o keyformat=passphrase \
46-
-o keylocation=https://github.com/openzfs/zfs/raw/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1
46+
-o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1
4747

4848
log_must zfs create -o encryption=on -o keyformat=hex \
4949
-o keylocation=https://github.com/openzfs/zfs/raw/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/HEXKEY $TESTPOOL/$TESTFS2

tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_location.ksh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ log_must key_available $TESTPOOL/$TESTFS1
7171
log_must verify_keylocation $TESTPOOL/$TESTFS1 "file://$key_location"
7272

7373
log_must zfs unload-key $TESTPOOL/$TESTFS1
74-
log_must zfs load-key -L https://github.com/openzfs/zfs/raw/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1
74+
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
7575
log_must key_available $TESTPOOL/$TESTFS1
7676
log_must verify_keylocation $TESTPOOL/$TESTFS1 "file://$key_location"
7777

tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_recursive.ksh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ log_must zfs create -o keyformat=passphrase \
5353
-o keylocation=file:///$TESTPOOL/pkey $TESTPOOL/$TESTFS1/child
5454

5555
log_must zfs create -o keyformat=passphrase \
56-
-o keylocation=https://github.com/openzfs/zfs/raw/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1/child/child
56+
-o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1/child/child
5757

5858
log_must zfs unmount $TESTPOOL/$TESTFS1
5959
log_must zfs unload-key $TESTPOOL/$TESTFS1/child/child

0 commit comments

Comments
 (0)