From nobody Thu Sep 26 11:06:22 2024 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 4XDrPq24LYz5X7qr; Thu, 26 Sep 2024 11:06:23 +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 4XDrPq0Jg9z4HLN; Thu, 26 Sep 2024 11:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727348783; 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=4JAbgvYWgEGZ8MxgBMvaRx/0gMmVTrHKXf2D+pl5bsU=; b=Uz7uBLZbyrnDk8PUs2LywC2GZBA+VTJJcTPpqg/7/ejQzXJtjrDu4vXB745r1y1TL81jvV hE2kveXFRsXUVmHZF4ojZMWIzuexw3pJFheHrDiJ019KqnVbvgm+O6o7TQAbDWuu3ECvwC 5ZqOUhuj8EYV/U6b3f4/AxQQA3bVBIQx8hfpKp0ixq6JgX52xiOhSGjl+JQaCr7gkytkDu Hmh3ItvPlpHLhxtTHHGlpFlB/3gGkZ3dSWuPd2x8LupYXRPU9a6I3nhpYPwJJhqbIU7IoE SgBFzVdVqScan21rk6H9wwyaCUmJTbJjLRpMmXJEVz9P1SoM1i5hcRJvV6d6BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727348783; 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=4JAbgvYWgEGZ8MxgBMvaRx/0gMmVTrHKXf2D+pl5bsU=; b=AIIavwOH52XHqOOVJ1T3KBCBFjKi1NZdIeMCmSXNMX4UveMILTjVdqepSBimuLAzpgeePp +kPp4iXUT66xqmKZyeBleV2rzX2gJAVHkx1Dyfhr5JKGOo5yZoB8cRubmkWCUTRnaXiq0X v8OHqQYv6oZy6iP52D4EG0Z7JydnqrDfZABq/vvA6FAMHUR60UU/Zqt4Db+af1VoN1d3+H AwYkYgHpFpld32mu2y7QHLORMXRhSNV0G6DavVYnXlEHQvfqGyBDTZXq6XLTRQypFSz+Mi TU1EX1tfPZ7ishjHyWZLnPF4stOQu1ljgcJOuXb4KYE6hQRG2mrzCFf9l6/L3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727348783; a=rsa-sha256; cv=none; b=EryYGgr1BVpTHpGnLzTWJN/o1tWjyyVZsUthdn5690pOylIN3ITWfr4LJmuoZzFQeBmvKi xY9fna+/L3Ztz4wiI2gjcVBPmztc/RxsMwFdYYA2HJ8ZsswZWDi8PXfqEcBUAWG86KWzNr YZWOb4CrdSzSROhFXv0kOzJqqMFoFUDa0Yke7H8coD8U1meREfXR71YMp7i7LWo9nXxUgm 3XRNtZ2TRXYhOjLh/gIz1VRa8ii7kevf4uHSywCygJcujk+7rvlnyQ63b8Li3CHyn+E/kh r/PtCHSHJMOG/OrqBfiXj8oUVk6Fc09WauxLXIm3pFt0vw3m02R4D8FtarG+OA== 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 4XDrPp6PwTzttJ; Thu, 26 Sep 2024 11:06:22 +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 48QB6MK3063678; Thu, 26 Sep 2024 11:06:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48QB6Mmn063675; Thu, 26 Sep 2024 11:06:22 GMT (envelope-from git) Date: Thu, 26 Sep 2024 11:06:22 GMT Message-Id: <202409261106.48QB6Mmn063675@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: 120740221fd4 - main - release: basic-cloudinit improve default image 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/main X-Git-Reftype: branch X-Git-Commit: 120740221fd4a4577e63e6c279f9873cabe449d0 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=120740221fd4a4577e63e6c279f9873cabe449d0 commit 120740221fd4a4577e63e6c279f9873cabe449d0 Author: Jose Luis Duran AuthorDate: 2024-07-30 04:47:04 +0000 Commit: Baptiste Daroussin CommitDate: 2024-09-26 11:01:03 +0000 release: basic-cloudinit improve default image - Add the firstboot-freebsd-update package, as long as we do not have pkgbase, this is needed - Support SLAAC by default to complement DHCPv4 (use SYNCDHP instead) Signed-off-by: Jose Luis Duran --- release/tools/basic-cloudinit.conf | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index da4bed5ea5b5..a03c11603ed6 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -1,6 +1,4 @@ #!/bin/sh -# -# # Should be enough for base image, image can be resized in needed export VMSIZE=5g @@ -9,13 +7,17 @@ export VMSIZE=5g export CONFIG_DRIVE=YES export CONFIG_DRIVE_SIZE=1M +# Packages to install into the image we're creating. +# * firstboot-freebsd-update, to install security updates at first boot. +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update" + # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="sshd growfs nuageinit" +export VM_RC_LIST="${VM_RC_LIST} firstboot_freebsd_update growfs sshd nuageinit" vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf dumpdev="AUTO" -ifconfig_DEFAULT="DHCP" +ifconfig_DEFAULT="SYNCDHCP accept_rtadv" sshd_enable="YES" EOF @@ -25,7 +27,8 @@ beastie_disable="YES" loader_logo="none" console="comconsole,vidconsole" EOF - cat <> ${DESTDIR}/etc/ssh/sshd_config + + cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config PasswordAuthentication yes UsePAM no EOF