The branch main has been updated by asomers:
URL:
https://cgit.FreeBSD.org/src/commit/?id=863dc799f74306e18625e29a7522c2fe72533a89
commit 863dc799f74306e18625e29a7522c2fe72533a89
Author: Alan Somers <asom...@freebsd.org>
AuthorDate: 2025-07-22 23:31:06 +0000
Commit: Alan Somers <asom...@freebsd.org>
CommitDate: 2025-07-23 16:24:33 +0000
ctladm: Use require.kmods for cfiscsi
Use the standard require.kmods ATF variable instead of ad-hoc code to
load the cfiscsi kernel module.
MFC after: 2 weeks
Sponsored by: ConnectWise
Reviewed by: imp, Siva Mahadevan <m...@svmhdvn.name>
Pull Request: https://github.com/freebsd/freebsd-src/pull/1784
---
usr.sbin/ctladm/tests/port.sh | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh
index 5bc5d879c983..d966529a85ae 100644
--- a/usr.sbin/ctladm/tests/port.sh
+++ b/usr.sbin/ctladm/tests/port.sh
@@ -38,12 +38,6 @@
# PGTAG,TARGET pair must be globally unique.
PGTAG=30257
-load_cfiscsi() {
- if ! kldstat -q -m cfiscsi; then
- kldload cfiscsi || atf_skip "could not load cfscsi kernel mod"
- fi
-}
-
skip_if_ctld() {
if service ctld onestatus > /dev/null; then
# If ctld is running on this server, let's not interfere.
@@ -118,11 +112,11 @@ create_iscsi_head()
atf_set "descr" "ctladm can create a new iscsi port"
atf_set "require.user" "root"
atf_set "require.progs" ctladm
+ atf_set "require.kmods" "cfiscsi"
}
create_iscsi_body()
{
skip_if_ctld
- load_cfiscsi
TARGET=iqn.2018-10.myhost.create_iscsi
atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O
cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET"
@@ -146,11 +140,11 @@ create_iscsi_alias_head()
atf_set "descr" "ctladm can create a new iscsi port with a target alias"
atf_set "require.user" "root"
atf_set "require.progs" ctladm
+ atf_set "require.kmods" "cfiscsi"
}
create_iscsi_alias_body()
{
skip_if_ctld
- load_cfiscsi
TARGET=iqn.2018-10.myhost.create_iscsi_alias
ALIAS="foobar"
@@ -173,11 +167,11 @@ create_iscsi_without_required_args_head()
atf_set "descr" "ctladm will gracefully fail to create an iSCSI target
if required arguments are missing"
atf_set "require.user" "root"
atf_set "require.progs" ctladm
+ atf_set "require.kmods" "cfiscsi"
}
create_iscsi_without_required_args_body()
{
skip_if_ctld
- load_cfiscsi
TARGET=iqn.2018-10.myhost.create_iscsi
atf_check -s exit:1 -e match:"Missing required argument:
cfiscsi_target" ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG
@@ -288,11 +282,11 @@ remove_iscsi_head()
atf_set "descr" "ctladm can remove an iscsi port"
atf_set "require.user" "root"
atf_set "require.progs" ctladm
+ atf_set "require.kmods" "cfiscsi"
}
remove_iscsi_body()
{
skip_if_ctld
- load_cfiscsi
TARGET=iqn.2018-10.myhost.remove_iscsi
atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O
cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET"
@@ -314,11 +308,11 @@ remove_iscsi_without_required_args_head()
atf_set "descr" "ctladm will gracefully fail to remove an iSCSI target
if required arguments are missing"
atf_set "require.user" "root"
atf_set "require.progs" ctladm
+ atf_set "require.kmods" "cfiscsi"
}
remove_iscsi_without_required_args_body()
{
skip_if_ctld
- load_cfiscsi
TARGET=iqn.2018-10.myhost.remove_iscsi_without_required_args
atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O
cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET"
