From nobody Fri Jun 6 16:27:00 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 4bDRY03xSbz5xd0l; Fri, 06 Jun 2025 16:27:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bDRY01zm1z3LBl; Fri, 06 Jun 2025 16:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749227220; 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=YoD4GD25kI5YRIxnvP07Cv12zyYKpjXwB/0kc+fxsJk=; b=mZ2k1R43567BCUJOnW2XOTMXU5v2XJ66lovo8DYX3/lKB9OwTFw8/OFgZo1c6jiG1V8mFw hkn14ABCxZ4UZfQxWMVyEKGTo4WOVuVMNMSD246Lx/hd0ivk+ldD096cbueB/Puy7bqYS3 hChdvnTdvVJ68rS+CAcsC32vJf21ve3n0276Y/N6la06cIhDaqQN64qS91vrBTesWEjl3d I9HN7ru6K1NqIkJUgS4vNoGwUA5S2MQt1wW5AEpuiGPl1pOmBNwKqAw46iKPUhIPxrZtGI lMyOK9HJlgzFvSGr3GPC8M1GjYS8AayNfKjmP+0LLeVeg7qIfuNGj2Ku5WUW6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749227220; 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=YoD4GD25kI5YRIxnvP07Cv12zyYKpjXwB/0kc+fxsJk=; b=rh3pW4tdkq+ALATF/z6duXNDmb5+3iMNkURaN1PRrekkDf+t2j3BvcTi7WAOgB1oDqRspF 6zTKaVTtlBf3pJRk2NFM4VUznPwTo47bQZlbd+xIu6bs5zcM2gtAuJ4KK/twB8Vko8LRKd mWAv0QOuWyJK23Ji3VUQmhFQWMfivdwMX1g3rUFZ2AS3W1FkBihPePU9Jp9w5L+wIUThAs YV5ffpkWrKG1r4DXWRJw97Tiwn2Lku/heWUDsozi4TbsYVX3KquS6W9xCztbPa/IMVK2GA GwvaVv9sjtuVRstAhWKZwIlTHdgK2yJXp2CiJBJG9JEW6WW1KYoW6uGExQb70g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749227220; a=rsa-sha256; cv=none; b=q5Jb5QhoDvu2QesAnHAr6Vq8U1pnT7dryqZfo7sx9+x69nBD1qPgF8JQpk/VTjOWcmifOs NcbtUo7cPGa1SIuFezviF+nRQXMXtyUsxGVzeYPIPAWuz5FmhZHkTy6L19ae5o6yjIA+GN GuCrWtApij2Pd1sVLJhw7WwIlg2yDxpWuVvO2Vx28/u65sDRvLYWSs3gPrk9FLOK+6+lxV DI78NjpysnegVzmjH37TD6NKEYMIDx+gSPxqw5AEE1jP+9x4PjDqDrzi+rlC0vl+o4eb6Q Ns5QFSaYJP67IvfINmv0eZGY9iTbHX9UxA1EIIgfB0fuwVwCVvMvIVY87XLApw== 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 4bDRY01Pp8z12jn; Fri, 06 Jun 2025 16:27:00 +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 556GR0IR066486; Fri, 6 Jun 2025 16:27:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 556GR03Y066483; Fri, 6 Jun 2025 16:27:00 GMT (envelope-from git) Date: Fri, 6 Jun 2025 16:27:00 GMT Message-Id: <202506061627.556GR03Y066483@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 43b82d69b252 - main - nuageinit: add a function to bootstrap pkg if needed 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43b82d69b252ddd50ac82e54481f2184b8212869 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=43b82d69b252ddd50ac82e54481f2184b8212869 commit 43b82d69b252ddd50ac82e54481f2184b8212869 Author: Sebastien Baylocq AuthorDate: 2025-06-06 10:20:46 +0000 Commit: Baptiste Daroussin CommitDate: 2025-06-06 16:26:38 +0000 nuageinit: add a function to bootstrap pkg if needed Sponsored by: OVHCloud --- 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