From nobody Mon Jun 23 07:44:09 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 4bQg7t11SQz5ywgv; Mon, 23 Jun 2025 07:44:10 +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 4bQg7s74PTz4C91; Mon, 23 Jun 2025 07:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750664650; 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=LVHD2p2Z5bLUBMN47ZkNlPOfEGaDhjCb9OHc9BE4MiM=; b=uIIMq1S84dVxs6a8eu2BBnspKfn7th6Hx9aPglZWLgB6WpHyhdajiHQoF5fIL5kNZizUi7 4p9XR2rD4+7bALYImN5BArh05Lx1AMmNtK1TrGI+4R0jo4HLT/QwRUw2Vn3lHkAslh7HPR 8BPfpJuGYOHf6WRXk4z+XAR0pvjJQAjByRndjJAvRRXQM3nOgmTueqYbUcaxr2R0x3bxzC N9se9BQUne7v7R0wyf7gWflgVBBfoPXlCgr9RTuP9FC9PMkSbCh6iISm1BpPiNB2rISsbl ay5kAViTqLx/8nI3haDaxHfmutP9OpFwxAq94a5lrQPUsF8OxO4kPT1GQsOqDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750664650; 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=LVHD2p2Z5bLUBMN47ZkNlPOfEGaDhjCb9OHc9BE4MiM=; b=V8TJSBzLyxjSeMIp6ryn7nyezYTDLc/EDq5PGkDYAX2NFuadHZtB8lb5seS3AmIwT7mZHM ZwlAtDKOiMHDpDJ7/yGw5N7z4Sf9mNSds5eNhD6A9w40CL3hODHgPE+m/7XOujVL1mDu/n OjhNwZFPvUwuOTK1k/nIwoPLC7mmIVDlq1gPmZNemV/0yL1s2POiUeN6YWWcalBKfCmq64 ZYAuZRoebPsKt+uFPS3EIk08QZR1F5jpohFGROHbwoauPsqAOC3D/BrvmMPhjZNUXDNyF8 VC8gxD0sA4bGelrF502DZCP5ZcKIfiRweKg/4xw9kaEtJNa1mMZ3BehK/aDmNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750664650; a=rsa-sha256; cv=none; b=JBUUCaKw4XDUj+QdObQJdZtZPy6Wj/y7Wo/bE0xp0b/PG5hrTYmAbSH9zw+ZXWNmbqdi4e gmU58A7CQLGJYQu44QNbGVoSqYtQd7tE61AXk3JJOXZEu9Qf5+/b7jC4iCD99AL4ur33in Ow92zpLDEFbhMVqULys1qTuMfByhvLoK5rXJOQNvbMz7mTz6cWzDjy52ud2itaov+k97aY LUL/EkeoLssI5Hqu/qYB+DvODaY80wTPvOMmbRNNfuWmnExC4jtsJlQgVLEkNyYG5GNigG JeIuB5DqghJgpKGNdHvElgy/46ZYKgl18UPDKKcBplGGOCy431sfEP4SgpVCww== 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 4bQg7s6gYmztGr; Mon, 23 Jun 2025 07:44:09 +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 55N7i9GV067187; Mon, 23 Jun 2025 07:44:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55N7i9TZ067184; Mon, 23 Jun 2025 07:44:09 GMT (envelope-from git) Date: Mon, 23 Jun 2025 07:44:09 GMT Message-Id: <202506230744.55N7i9TZ067184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: f08ebb3a6656 - stable/14 - nuageinit: add a function to bootstrap pkg if needed 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f08ebb3a66563a6e5397f2994fdcffae2aace58d Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f08ebb3a66563a6e5397f2994fdcffae2aace58d commit f08ebb3a66563a6e5397f2994fdcffae2aace58d Author: Sebastien Baylocq AuthorDate: 2025-06-06 10:20:46 +0000 Commit: Baptiste Daroussin CommitDate: 2025-06-23 07:43:12 +0000 nuageinit: add a function to bootstrap pkg if needed Sponsored by: OVHCloud (cherry picked from commit 43b82d69b252ddd50ac82e54481f2184b8212869) --- libexec/nuageinit/nuage.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 15af5afbd9f0..addab5419193 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -361,6 +361,15 @@ local function chpasswd(obj) end end +local function pkg_bootstrap() + if os.execute("pkg -N 2>/dev/null") then + return true + end + print("Bootstrapping pkg") + return os.execute("env ASSUME_ALWAYS_YES=YES pkg bootstrap") +end + + local n = { warn = warnmsg, err = errmsg, @@ -371,7 +380,8 @@ local n = { addgroup = addgroup, addsshkey = addsshkey, update_sshd_config = update_sshd_config, - chpasswd = chpasswd + chpasswd = chpasswd, + pkg_bootstrap = pkg_bootstrap } return n