From nobody Wed Jul 23 16:24:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bnKGg5ppsz62VsF; Wed, 23 Jul 2025 16:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bnKGg2zwyz3gcX; Wed, 23 Jul 2025 16:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753287883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wKwMO0jkWtKogj6WHG5+eRE2CDwDU1iSBYSJGf6GrYg=; b=EXjjrJPhYh8zrMjy8X3KlaKI4HXrfmugyUAXTbkyU9if8l34UMVGf+n/Hj5BOPc2DJEtvo 4ZqjMoGIRx2KyCSFlUm4dwwtmhzl8hDntvTmIhzzTA3G4OcidWZvVFZ6+IcRp+us1+2rnA ZxKEJPuEH4MlZj9q5sRoIm5qdpp6Vytuaj3yWtTKdHknxpA+9tjmz6dtg9ZbCXnCkoQdKR eBG+0wwMeIbtu/2HjclG/H5/XBtY1swnJ2Gm+TO1IxbFk+yAvetYu8SjQEhVQFm+pHnQtn J2XFQfk/SyfTAJD3T5IuW4PDaVEtK4gwKA1yTDLM6SiXkhOmChpQZqGp3ITdTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753287883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wKwMO0jkWtKogj6WHG5+eRE2CDwDU1iSBYSJGf6GrYg=; b=KICo4gOwtSBAJjIeYQaMVR0sCvZ3rgULAYt+uSF9QQoUYrFOqh1CV4EckKUd4qX65jtplr M17XKm4gjJWrj+V+DQAifEEDp+8DxrZ2pM9YonAxcQliVzIc8BtVuKZhAIB/sHkBeJm8Et EebL+e2D1eIHkEBsh1yRt4bx800xVfgwrm+JVYIvTVf9G9hiPN5J+WXHUQJMuU36ExrvLI 26fB8BAtS9O0Xd9RBNcH2QpNfQl1KFu3IV6QYVVhgB13Wsw3Ndq/0/sHISEJEfdn0AHrIG r6/07PF6mREpqla2EbR2lsx9qkEu9aM2WR3N9NXZL6U87HjRL3XqsaU1q3bCCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753287883; a=rsa-sha256; cv=none; b=ufyZ02OfbhZrsKRJCq2ogqiu7n5m+0XGdcvzWDOhbEbpJLeZ85tjg8SWZezJEEL4liqvEK Y8y24wdXQTcUqHW/IQ00PSy/w6OsTzo3nAV8vfVYgmguLpA8/ZZWbXMi+wfDnMp6HicBqa HUjXmcU4d4tqiHRizH+Wa5O55AHob8ReG2UQ2/Te5A/9FzX2XNpeegOQCn96nfb7bSOGfe 62rDZnzGov1VxH9j0ej7Pr1lfU+t+bK3sMyeXFuwYd3g7PH2qbpd13bXfxnnhXFlfWjB+9 lkwqhwwLOt0S8vSnqlfnqcE3fTTz56x5zhpbG5AXh9FRim4MG6OQduP7HIbp2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bnKGg2KdPz54g; Wed, 23 Jul 2025 16:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56NGOhpw058309; Wed, 23 Jul 2025 16:24:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56NGOhb9058306; Wed, 23 Jul 2025 16:24:43 GMT (envelope-from git) Date: Wed, 23 Jul 2025 16:24:43 GMT Message-Id: <202507231624.56NGOhb9058306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 863dc799f743 - main - ctladm: Use require.kmods for cfiscsi List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 863dc799f74306e18625e29a7522c2fe72533a89 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=863dc799f74306e18625e29a7522c2fe72533a89 commit 863dc799f74306e18625e29a7522c2fe72533a89 Author: Alan Somers AuthorDate: 2025-07-22 23:31:06 +0000 Commit: Alan Somers 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 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"