From nobody Sat Sep 27 14:24:07 2025 X-Original-To: dev-commits-src-all@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 4cYqT4086Xz69P0V; Sat, 27 Sep 2025 14:24:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cYqT34txwz3vdy; Sat, 27 Sep 2025 14:24:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758983047; 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=+wcV5Wqc7bmXgTcTdqDOuJK6qxlgAuMnvRNQhtUSCU0=; b=QNe6OyjyJuiJ1vC/pV8MHkA/WhczJS6+JaCJq9huEhGhO4SmnDN1m3cKSYsWuFgjCq7v0v Vit5EWNOJeg+0QNHB7P9im7jMl2KgFNObrEztSWYWeF/L+jOH4VYeXDRjL7KvjyxuwaNzQ WPQA4HmXk4rbv3n5F+z1ylWbdLQ53F7awlivqykebgeImrhDF+y8rC6zba24bscGMCmJlV d04YY1PE8vniXoiFTsNCxc8OcO/jmA0Ja15EYflVTcksCIDMBSmxiT6fjVq8xWoxZuDbfp lBTORnhwcl2p4JGUoafgh0NuZI1Q1VT7hnewIFUBkbyMfAdelQu0BmyW/fbuzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758983047; 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=+wcV5Wqc7bmXgTcTdqDOuJK6qxlgAuMnvRNQhtUSCU0=; b=T2zXXyZKUeZAXU+T/+t0IPrBmdDkSYEYGOAccmzM9B1rdsBA5L++nmcBknihBhmMShWP/o zoB/RlCzXLrjZZ8Fz5YfEL+NV530rQutzcC5hpIyW89+kF5c9x2fzDXQXcnGdtZZtScxgV 0eC95WQzfM/GmhsrwLshJvAH4hv1K54GqdMtcEc+MqLkjpmiDVbi7ZHwMtIKQ6KBHiN2E9 M18Lc+M6d0c+Cf96oo0NWbVC1fo9We28WQvN7dUd9UktJTbTujyBgOQFNLv8XG/QfNgW9C 4SoKPEiKz+PqbPzSTTQGe53KsZXmyp8iVziaM6/WKO5x3JQYbeBPH5b6VeFxGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758983047; a=rsa-sha256; cv=none; b=lJOnlYIkcl6E+hetxKVbgktODbx91FUhu6JCr6hZN68Pu6zGZhT9Hs2y7Zs20qx7k9m9l3 d5lc+zoInIdK1sWVfE+Yx0HmyDXGMgDnzbfNfupx7/Nr80IvxdwtsZF5sHvF8NfP2W1zFM lZ4325inNqzko4V+b3xpbD1GbXg9bxHRhlRei2H8+0WKxwvpmjU6Cad+K1iTUiOC12SJfS kVFI6oJpjgdwQ7eulT42l5S2PPb0JDvP9lCwAjj5cgK6p72RfAUTAUYFaERh4FCCbIQZh+ h9X8LkYhJDdywm3bL5bE3WV5fuVgBaNESKen4lnzroURyrcXTltE7Da+7/91Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cYqT340hMzdSh; Sat, 27 Sep 2025 14:24:07 +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 58REO7U2087654; Sat, 27 Sep 2025 14:24:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58REO7RJ087651; Sat, 27 Sep 2025 14:24:07 GMT (envelope-from git) Date: Sat, 27 Sep 2025 14:24:07 GMT Message-Id: <202509271424.58REO7RJ087651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: e1deeea6c173 - stable/14 - ctladm: Use require.kmods for cfiscsi List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: e1deeea6c1737d26c9160d1112138137292082e5 Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=e1deeea6c1737d26c9160d1112138137292082e5 commit e1deeea6c1737d26c9160d1112138137292082e5 Author: Alan Somers AuthorDate: 2025-07-22 23:31:06 +0000 Commit: Alan Somers CommitDate: 2025-09-27 14:21:30 +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. Sponsored by: ConnectWise Reviewed by: imp, Siva Mahadevan Pull Request: https://github.com/freebsd/freebsd-src/pull/1784 (cherry picked from commit 863dc799f74306e18625e29a7522c2fe72533a89) --- 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"