From nobody Tue Nov 18 00:52:17 2025 X-Original-To: dev-commits-src-branches@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 4d9R0K6w3Cz6HHVG; Tue, 18 Nov 2025 00:52:17 +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 4d9R0K46y5z40CY; Tue, 18 Nov 2025 00:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427137; 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=+/GoDrAgL6J51hLop+FGHNzpKx/UQwyd//gbZJf1HiY=; b=ypmneIikk2Vc/+skZgRU7n6bKVCO1FkLH4x9j/h1nCEf9RuFWgJvb1h9ALA3vtx4bxvAc1 0TsT8ZzoYGXnvVm7hoWq1/21HBsYJWTr9ZRRTo9zRbqUymVAwQKoyCM3lO1H2pB6DpWOyM xTTcg+oK+i7grpjjMxsJusfe5I/G4OgUhrPbC4kU4IwdE4yGFRZCjeCwYrGlbUamZ9Jivp 9oO3keT05o+63xbUPxpmoIOz6/pMtZO5nHapMmgUkK5IfRleOorUNyDxWDzUUQShr3lN3Y 1IepUIIeLQ4SU6b25vjtKHwb70P/KBA9TYLVbjb9Qe39mvFhZwV+wL+HiOVWzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427137; 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=+/GoDrAgL6J51hLop+FGHNzpKx/UQwyd//gbZJf1HiY=; b=C5odIEozXI6VBr/OeEqgwnxe0kIClL2rbeUL5BjlQrVheuBnMU3qePwoAG1NHkt+SOkV2n OfzDnkHHhIkE+I54gZvA95z2wKRt5SSqKRrMEmKqDZjMJqlxfLfORK+DvRsTk+KPirQ5i+ BP4WnS1i8y26ADgemi6Q6ly8nc9i8TBmkSFuqYCEqSiw2nQzdRzxweUFNZulY/Y2YftSIY hgAm/ounwl60xgctHjNvZ/I+8s3RYOqut0EQQl/CoiUVIkoVKtjcG5riFmqm4f6gqczI7s 6WlY96hvsO7/H/QHrVHGmMNLaxxmrrCeTXcx2j3BrBlNU6YdaQFnWHXUPxwq8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427137; a=rsa-sha256; cv=none; b=BP/hP1TUowbKqtbX/hU+STw/Y++6Q1WZT/7pf1ELvssOdabeFnAIkXShBNcGhUD3o7JyCo TSEsD1OO+o20GyyTzk9UAJ4SR9jYRasWhGpiAas0iGM2SG2JsGUjvggQKq/pwezrQx2ovU Fbc3SRMgltlgKIjPV0GW+0jBo5vpXdudQNwdg+drZxZb2YRRAT/TQqPiVJmoTykl8qIVud ag8/SYNoIEjJRnUQVQovry9K6F4NoWZicPlW6KZ2MlY8U8J23SftAEgSr8OXBi5jBgaJUn BXeoCFU/LMhSbuY676bkKS5JLAMEMTKl3Sm5JwXYfANQIGSTY28qhJJzjZPKYA== 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 4d9R0K3gyfzXdl; Tue, 18 Nov 2025 00:52:17 +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 5AI0qHai047013; Tue, 18 Nov 2025 00:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qHZ1047010; Tue, 18 Nov 2025 00:52:17 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:17 GMT Message-Id: <202511180052.5AI0qHZ1047010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 4804bb0d4588 - stable/15 - virtual_oss(8): Use kldload(2) instead of system(3) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4804bb0d4588d5e0a456b7009295c4e031aa7316 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4804bb0d4588d5e0a456b7009295c4e031aa7316 commit 4804bb0d4588d5e0a456b7009295c4e031aa7316 Author: Christos Margiolis AuthorDate: 2025-11-11 12:07:40 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 virtual_oss(8): Use kldload(2) instead of system(3) Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: imp, markj, emaste Differential Revision: https://reviews.freebsd.org/D53617 (cherry picked from commit 7bedc4634d893174b9cef06c7c13e5f1cb24808b) --- usr.sbin/virtual_oss/virtual_oss/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index afa4ad0727ca..f2fd085664ed 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -26,12 +26,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -2539,11 +2541,8 @@ main(int argc, char **argv) atomic_init(); - /* automagically load the cuse.ko module, if any */ - if (feature_present("cuse") == 0) { - if (system("kldload cuse") == -1) - warn("Failed to kldload cuse"); - } + if (kldload("cuse.ko") < 0 && errno != EEXIST) + err(1, "Failed to load cuse kernel module"); if (cuse_init() != 0) errx(EX_USAGE, "Could not connect to cuse module");