From nobody Tue Apr 8 18:59:20 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 4ZXFk10sJxz5sn0J; Tue, 08 Apr 2025 18:59:21 +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 4ZXFk05FqMz3jYk; Tue, 08 Apr 2025 18:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744138760; 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=MSRYCsIsq9b4u9FNPhzwZysn3pe94tPk3zyFJlYVXRc=; b=hzYnqh0n6P/AbBp5+23OWYZLXKMqxdKuKEEl3j1krUG+bhKUYZfsL69xagt5kOKLiEXcWh Xr/aK9l2JcA/JcU0Od0wMpZ+7I/fSP08lxmrRw7UHuK9QyCXnIaTr+gUcEHcxTs+f8DuUy 7LmWI+BmwWuVnGX/HtyMdhcC/kG89QIAJMlk0poGnGJuEV67CGV+eD5TeWgPIAUV7MK394 qV5+zTZb1zLUxDBwoJpZq9OcpWngFajk6jCiV05ZhYvM4IQuIFkaTlgG+445MdijCdI7mV Omsphrki0SRPt+osdhla6QvB1GxfHIWFm/1z5SN6iYGJQu3WK3d9N/S2YnA/cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744138760; a=rsa-sha256; cv=none; b=ryIWtOSBYQd5ANKdsHu0k2zc1pBzN9NgSgva/OnSskvw/hf4Ufh2oIZCuZuCMYAFeKiSiH m9lrWsh8+VpoWod4hXKVF43FhP/UWXASQq37m99cRAtooB/AGrAF90snN/1MjiWuIqh2ke uBkMz4oXvP5oz4LLcNvsQhlb6Mnx0H/P6vND5qFudNZ5bQPd1Go3vFDOKpj919wu2rmHfx aHpZ0mU9VdJ5XiHEOmJWxvs38TQW59amj2yNQBePrheUg3MVyor75X4yauy55+CsrPUli+ 0ypiEYrYMj71uOOP2UlqLtnYBuE6N3RicsmkqscLfc7vEFnTx5qIJlKqaQmtZg== 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=1744138760; 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=MSRYCsIsq9b4u9FNPhzwZysn3pe94tPk3zyFJlYVXRc=; b=f7A6+LY5pjlMdOnDHpGuP5TLpN2BHjV+5uiwEEf/IRMJ4NJIgQK/VI/8ATecEJnK+9Vyxs Tv7nyHx6MWBgR4xFvLvbSjuoGC1M3Ir9n2lasw0HtU/ROG2kMdQUeQuVMnd9ZZ3uJiPZW6 pQY2WuPOjF6ZJ7S19bpVIihYrTkJWFrF5Uu4l5svd22J2h+3s1wLEKGX4XmGA8fLUQGBqd 2u24D+nql7QBRFC61mvYLIjGf2hnmVkDdijNs/X2UBXrH3/GkkkR3Z+y+AKXCEqGyCdFsK 3LVnvklrdkiv8alF/e3+dF1huPkvaeQbvMrOkiF7V8iYTHTHOTWlMMvE51bVdQ== 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 4ZXFk04WLdzkPY; Tue, 08 Apr 2025 18:59:20 +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 538IxKFf018448; Tue, 8 Apr 2025 18:59:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538IxKxh018445; Tue, 8 Apr 2025 18:59:20 GMT (envelope-from git) Date: Tue, 8 Apr 2025 18:59:20 GMT Message-Id: <202504081859.538IxKxh018445@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: 7eab72fae632 - stable/14 - release: ensure default sudo flavor is selected 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: dch X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7eab72fae632115fa93f5b39f1f39453e0630af9 Auto-Submitted: auto-generated The branch stable/14 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=7eab72fae632115fa93f5b39f1f39453e0630af9 commit 7eab72fae632115fa93f5b39f1f39453e0630af9 Author: Dave Cottlehuber AuthorDate: 2025-02-28 22:27:31 +0000 Commit: Dave Cottlehuber CommitDate: 2025-04-08 18:58:08 +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 (cherry picked from commit 457d745d90a6b63793c9ca17bcd7ec5ff4cd8b93) --- 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 8f96bd5cf5a1..082cf746b6b9 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