From nobody Fri Nov 13 15:54:41 2026 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 4jR1zP3lNXz70p10 for ; Fri, 13 Nov 2026 15:54:41 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jR1zP2w3Jz3CkR for ; Fri, 13 Nov 2026 15:54:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794585281; 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=wMOdqrMmlFI4f/7DFSQl5MqTe9vdHjFe8pOe0WL21oI=; b=aD0CEPzCQvJxaxsTCwqta7hMX1TOwE93kQNkm+4tcOJQy0jgUugIyxul+DmuklIo4Sss11 KzjoIZC3XC7AGADMsDGoOuOjuSPPYc2mMSPopv19hUKjOQOb7LZK122th5hJZkdvsl+pMA rpiAR31ftynygao6EEm++WEG/kYOzBKzIwlF4oUytFlKFdV32ztMLiMAIPX/qXbedb7du0 Fz1C+maPZX5KI3pcP1RmUYyRDj6ON2z+/ReFuZ7uCRV8oj5/+LGn/9uQIg5r7b0mnYW/Ud RHYggo23Q3ROhUneIGhL1gSqIo58lkPbl2uG/n/ofuw8kAdmyn6E30V47jzYUQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794585281; b=n+m9qlvrkIPvvrApuqU45Q7m1Tru+faHLnD7Q82XNS5raFQSXJWTOsaEJPtqaXwIfmGwmR k38Nre9LREob3d0xu8gurKg+7OVW09H5FpP2iCG1bkUHvxK4vzFNLtsEdjHDIXVMESzUog ZVN/m0cnggMBP9K/MZz31dGM2yMchJT7Kzma3GagszdjYVgG8b17YAASKK4JKV18ONkoeG 1kwZ+dWqanRnNXPPxvWTrlxBIeYoVY9cBWE+HyIkgK7g/JNQyx97XuwjFVhPV46BMIUukI XvJqBp39QpNrR1Qzuy0x6a7ZHaesjivao4519nqcyPKvxeLR2a+9kJ1ZrE+XnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794585281; 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=wMOdqrMmlFI4f/7DFSQl5MqTe9vdHjFe8pOe0WL21oI=; b=t8xit+X6GxYVuu8dxHFZ9pXiwUPeUC/9gCyYM/f3oYHN5H3iFbqWt75ZzHq39DESHC8zl9 jx89YZq8cmFFAlQFXdsPeSA5lhSRWS7qk5TbiIvffzUsuUu0pctHpqtbyfcJo70WR1pb+4 alPJeHfXaxjy5TUqFtNQRUh8UiSAbI6ubLZSSu/7/xDtQnu39h+ZUWMEhfVb9Ua2eOFQ92 TO0AdvheOKoyyDfAmKQMrM4iwyiLl/DijaZybnJ4lVH1pPYrau8siMuuRRjKlHpZRbzlZC 8cMxusrGbJV25FYKkktILqxabrjfU8n8IWKU/Y+Cbqh/I2gqxNEOGePSiOq3yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jR1zP2Zb0zjLS for ; Fri, 13 Nov 2026 15:54:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ee6d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 15:54:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d9fa6016011e - main - nuageinit; Skip SSH keys and doas/sudo if adduser fails List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9fa6016011efe39022a25f26783590690aa2fe2 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 15:54:41 +0000 Message-Id: <6af732c1.ee6d.55f2edac@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d9fa6016011efe39022a25f26783590690aa2fe2 commit d9fa6016011efe39022a25f26783590690aa2fe2 Author: Ed Maste AuthorDate: 2026-11-11 15:51:55 +0000 Commit: Ed Maste CommitDate: 2026-11-13 15:54:22 +0000 nuageinit; Skip SSH keys and doas/sudo if adduser fails Previously we would still try to add SSH keys after a failed adduser, which would result in an uncaught Lua error, causing the remainder of the setup to be skipped. Reported by: llm-postcr Reviewed by: dtxdf, bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D61441 --- libexec/nuageinit/nuageinit | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 758a7f20b305..4cbbb15fe1ed 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -190,6 +190,10 @@ local function users(obj, metadata) goto unext end local homedir = nuage.adduser(u) + if homedir == nil then + nuage.warn("error creating user " .. u.name) + goto unext + end if u.ssh_authorized_keys then for _, v in ipairs(u.ssh_authorized_keys) do nuage.addsshkey(homedir, v)