From nobody Tue Nov 11 12:08:27 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 4d5QKm32JCz6GLMN; Tue, 11 Nov 2025 12:08:28 +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 4d5QKl6WDLz3cGl; Tue, 11 Nov 2025 12:08:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762862907; 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=Ws+CYpVMXdvDFs3mG+hPajWMIz5AfyLSB6SDsErZ/iA=; b=W9rPJHhBywE9lplIS/jB+9I3WJrHj25mY8NUv9PN6RunVhuG7ajEhjfmnqyRjBbQvZ8Hd5 DPIZMVvGGA/sDfOZwHyLlNa5EqgFQt9ead2ixL6HSj3d64OlWYI1Ck27DFD5KzeDIprQam XMYnvRZsanKub7xOOtG1q7DwJa0rJIP1VEpTuYB1bH+2wYl9clTvHGoEV36ZzcIykqDyWZ p3j3cOmFPHO3qSYKK1MrXgWBpq+j0kDO5yWPF0rBBUnm/IyMG1PxgtVyjx3i907NiDeq1V qZSMYqWCKxCATo6tPNklfYPUonBoKj+2o6KM5NgBQ0Ubyr//3CmjXKfrE1zDjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762862907; 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=Ws+CYpVMXdvDFs3mG+hPajWMIz5AfyLSB6SDsErZ/iA=; b=T+wZ5x0zERK0VqQruJ9TMpkqWrXRSh3R7tdJxFAjUv+fv9VXJ4WVf/9zRUeGpkSeKRtPXA 7lcGYuANHo8KAyiuneLq2EnJU/dAOBCCesAiuku6YuKhdGaTvnJGl9VDpDtR/EQQTtJY5w L3/OA+m7/mq4cUAq6fG9PRcoJa5rvMK9V/AuPeJrF5TpvsxNTN26ySlQnoVWAhGkvaKtVI ZlcwpiiAZK6uDYyD9zZOBKA+vpr5kr9kqh1v65e9B3X7g7c9uXxqoohiItjxO8JdKwww0n 6RdYH6Oi+K8dkYBABzm5PBs0UreiGgbofvncyAowwIcFBaOKjbViQw0c5zQ6hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762862907; a=rsa-sha256; cv=none; b=g+ieHz4WXBH5XpjWoqhCqmJJVJEr7w9QxXw1BFTExl0tnzzQIoYFAxABtCOiNkUmVxjpm5 mRNEyEaxxY/C21+A6hg8mTuj6/6ECivLM3ZidDsSBKtsqF3/os0ARbTTskhCW1pVAqdJ4R WP0V4+Xul8QlUXFxDfL6taWh7tHtnAQQ02NfmpMKllDwHVnWiOkcelQDaw5Od6za8TE3Ba 7oC/5wG2pMuk5Xt2Bxjfag+nJqkmp+jW4zTMckqW2c1tQPo8XNrNpyqjBQohmsEQkDUF4s qGvggAUa+WJRJ8SIs5ITUSuA/C0We3udgZwKXQVSyHG2kWCUdW8/AgRq+hX1uw== 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 4d5QKl66s2z13rZ; Tue, 11 Nov 2025 12:08:27 +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 5ABC8R0I035653; Tue, 11 Nov 2025 12:08:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ABC8RCb035650; Tue, 11 Nov 2025 12:08:27 GMT (envelope-from git) Date: Tue, 11 Nov 2025 12:08:27 GMT Message-Id: <202511111208.5ABC8RCb035650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 7bedc4634d89 - main - virtual_oss(8): Use kldload(2) instead of system(3) 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bedc4634d893174b9cef06c7c13e5f1cb24808b Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7bedc4634d893174b9cef06c7c13e5f1cb24808b commit 7bedc4634d893174b9cef06c7c13e5f1cb24808b Author: Christos Margiolis AuthorDate: 2025-11-11 12:07:40 +0000 Commit: Christos Margiolis CommitDate: 2025-11-11 12:07:40 +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 --- 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");