git: 80bffc566202 - stable/12 - bectl: tests: use -R <mount> instead of specifying altroot

Kyle Evans kevans at FreeBSD.org
Sun Jan 24 02:55:06 UTC 2021


The branch stable/12 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=80bffc56620228099986560bb385c8b3c4583ead

commit 80bffc56620228099986560bb385c8b3c4583ead
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-01-16 05:58:12 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-01-24 02:52:56 +0000

    bectl: tests: use -R <mount> instead of specifying altroot
    
    -R is currently shorthand for cachefile=none, altroot=<mount>.  This is
    functionally the same, but perhaps more resilient to future changes that
    could be necessary that may be added when -R is specified.
    
    (cherry picked from commit de661c9f8652f6a51a6ca83d404d9170404990f8)
---
 sbin/bectl/tests/bectl_test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbin/bectl/tests/bectl_test.sh b/sbin/bectl/tests/bectl_test.sh
index a4c3d7828acb..4a3fc78db0bc 100755
--- a/sbin/bectl/tests/bectl_test.sh
+++ b/sbin/bectl/tests/bectl_test.sh
@@ -51,7 +51,7 @@ bectl_create_setup()
 	kldload -n -q zfs || atf_skip "ZFS module not loaded on the current system"
 	atf_check mkdir -p ${mnt}
 	atf_check truncate -s 1G ${disk}
-	atf_check zpool create -o altroot=${mnt} ${zpool} ${disk}
+	atf_check zpool create -R ${mnt} ${zpool} ${disk}
 	atf_check zfs create -o mountpoint=none ${zpool}/ROOT
 	atf_check zfs create -o mountpoint=/ -o canmount=noauto \
 	    ${zpool}/ROOT/default


More information about the dev-commits-src-all mailing list