From nobody Fri Feb 28 22:34:34 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 4Z4NLL5kjdz59PQS; Fri, 28 Feb 2025 22:34:34 +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 4Z4NLL3SLzz3ydq; Fri, 28 Feb 2025 22:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740782074; 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=RA8bZszRB2Iazse0i1CafWLTmXU+Tr7GsDbCoHLeCBQ=; b=c2rLeSSefJApnY3DkR+7x5cHWarr7dqSvbiyBeXj577U/yGvvUlU4FpHA+K7gC7WoJp6IG 50gWGCZTCbqOZ0afPxOlwnEmFe8FPexAA1l89CD+O4mDn4twkI1ehAj8hfnBW/wG6Kua6X cGyhAQIV/5DgsTiUW6o/Os3ZiGbS5iThr1mbypkfoB5zuFEZAeMyRDfETk6rTNqe824fI7 EYrigSSMNxcIXVCxcz9lR7aSLSL06iDKoHtXncI/4ueUcL49qgVmaRHj2HIKCBTFH2CuY6 62scN7wqe5IJrSs1/r25u7f6ulIWekMl1jXw1K15InwXuSdAQxQK14/x6+d+Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740782074; a=rsa-sha256; cv=none; b=Kdl97c7U/VeTRA0485OzKZEzP9KNcvkCz1pBgv68q7go9MIm4rsLQ5zUJBTX4+jeCwmeDo cxPQE4cwfeBv3F2KoW1AJGl5wLTf4wupDEd0gRIsnfiS2nKXIH+a46NnSmbE+/A59l8r0k /dkj9A5CV1rKrj1XPF4/Z/oV85P/r1eFoUkaEOPieWsTJ9Xtv2y0jP/a7Dm+E5wzpffCGT pk2ehMu8zIlLqOklJ3pTu6gp4cw8UosSVkciKST6PUOnyvzNQ6iFB22W7OwC0aODKYU4RO Ed8xiaHFzbfg3+02B5gPRPlDBIvzopBit5rTruDWbyzZO6R4eAAOEVAyHqEYpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740782074; 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=RA8bZszRB2Iazse0i1CafWLTmXU+Tr7GsDbCoHLeCBQ=; b=oNoSrv1vVc+ET4isd7rN3BEGdgQyC0CWTmoMrxaeBJRBVDgGxj0LrpqLHuvFJfWuhGLIbI x6GXfxcMUXeLhwQN38Wn3U56WDHdLwpVaUCbf1D15viMXcdDVS8JCMiT3VKWW4jqIKLCmr FPRnBJah6wOjD82dEVe4JnNLpMlcQ1+RcK+UBEFxZV4TOp3gW7mCg0Vq97QpWZV+rf+a3R X49gJz6WbQQcrRshW0zL5u0Ax2/5tqcC5aDr69/9ISkcwa4q5FTK989cFDwZe2rz5mE1DJ hNYAomNOraFRUiyfCl7gzwbDQKQLJRJE16ZvPO1wPX1HxDZ205jP1psEMZxh6A== 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 4Z4NLL2nD1znVf; Fri, 28 Feb 2025 22:34:34 +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 51SMYYXr048132; Fri, 28 Feb 2025 22:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51SMYYHK048129; Fri, 28 Feb 2025 22:34:34 GMT (envelope-from git) Date: Fri, 28 Feb 2025 22:34:34 GMT Message-Id: <202502282234.51SMYYHK048129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 457d745d90a6 - main - release: ensure default sudo flavor is selected 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: dch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 457d745d90a6b63793c9ca17bcd7ec5ff4cd8b93 Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=457d745d90a6b63793c9ca17bcd7ec5ff4cd8b93 commit 457d745d90a6b63793c9ca17bcd7ec5ff4cd8b93 Author: Dave Cottlehuber AuthorDate: 2025-02-28 22:27:31 +0000 Commit: Dave Cottlehuber CommitDate: 2025-02-28 22:33:46 +0000 release: ensure default sudo flavor is selected pkg behaviour selects the non-default flavour, this trims 0,5GiB per cloudware image, by being explicit. Approved by: cperciva Differential Revision: https://reviews.freebsd.org/D48599 Sponsored by: SkunkWerks, GmbH PR: 284278 MFC after: 10 days --- release/scripts/pkg-stage.sh | 2 +- release/tools/oracle.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 495c328e4724..58b6d25fcccf 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -23,7 +23,7 @@ net/wifi-firmware-kmod@release ports-mgmt/pkg shells/bash shells/zsh -security/sudo +security/sudo@default sysutils/screen sysutils/seatd sysutils/tmux diff --git a/release/tools/oracle.conf b/release/tools/oracle.conf index 08a9a3a372b0..8a4206c05623 100644 --- a/release/tools/oracle.conf +++ b/release/tools/oracle.conf @@ -19,7 +19,7 @@ export VM_EXTRA_PACKAGES=" net/rsync panicmail security/ca_root_nss - security/sudo + security/sudo@default sysutils/firstboot-freebsd-update sysutils/firstboot-pkgs sysutils/panicmail