From nobody Tue Oct 08 07:07:51 2024 X-Original-To: dev-commits-src-branches@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 4XN6Y4113qz5Z54L; Tue, 08 Oct 2024 07:07:52 +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 4XN6Y36rvxz42sf; Tue, 8 Oct 2024 07:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728371272; 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=TYUPIq/MSIjsaaXlGzb0UXV5QKJM1CMiKJ+wLIvVR0I=; b=Psr7/zrjmhFQCD0tnrxMSfUBlfhmzWdbpG3St1tmLKSF/bm5gxasm5EDHA6lVY9fXflsnt C4aos55QDDQN0DwtIbI/XgAd5qJQx1ZkMxT/++ZcCFc05Xn7laiW3v1tV4RJ77DtI9Ffzo 8fwt7Z09yQJM9RH/LRyeQEbEruN1td/XfX9cl9wv5ZW4loolbwJwQ/CH+6ceHFekDyt4E2 ZzZysAtYasZBbsF5N2O5ZQkJRRNn/9ZtIIgcmNdIeIwxjQ0HONt1uzkGsdRQD/dFjIf4// IIyV7lhT+hqKIC3XU5zH15X7109QR2l4urNhxfbinE4HSJ+dWGDk3N5/jhxWmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728371272; 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=TYUPIq/MSIjsaaXlGzb0UXV5QKJM1CMiKJ+wLIvVR0I=; b=WhMuPGKiQbBnTK+qK4tLpq8cn/6riGSijCYOYv55084cy/G41yvItRGrdlND+9mvfNYvC5 zxk321g9jqHEr8hR1eaeVhvSMZAuEN7e8IHKr5P1NmPPqGU52Q4yr7akfNrnJ1Lh7e4pwy ErI9DadWDMY6GIkPdaWnTEOfthfpo96kGVGiVSmNXpkoxUypzLlZqHrBop4RcSDmqONOv3 UTogwFLPysMZzwePDFCVgjVeZ8+4ncsVaYXTT7TjLN1ncGE37zYYc8Zx1COmUBu2UU+5ps l5o2ivnRfo3RnlNNicLDztczxmlrAyo294hv0YBhDgbxSQCgagbDxlAN3cV7UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728371272; a=rsa-sha256; cv=none; b=xsuhE6S6HzkJe/6qU4iWdqBlnGI1AE/6jDLb0gabivc/8yPQs0209z1TzSuYG8SZtQ1zVR fkMKejzsiJ211Nn1G6G46sWGXynv1q96OZSsnXSXaei8WJktb/zIf9A9DvKLP+5UufCH+6 fE+zQlX69GLnqDHXhYB2+z41oR5TGJ93niRLUlNfaS7gc2xonseGw5bah21/+8lU9d8QB4 pYbe//jjPhC8CJZsgdQHoU0mxyhuZN4xyIZZzI4meZSGCjHKrUfEgVIDHr6pAxmG4oII3e Ns3sOsI3+fo7eZreDJFMitSqlmNZZhoGsuYMpfS5PZGvefAxh+K96b8LqORe1A== 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 4XN6Y35Rq7zKw4; Tue, 8 Oct 2024 07:07:51 +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 49877pjS051687; Tue, 8 Oct 2024 07:07:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49877pcX051684; Tue, 8 Oct 2024 07:07:51 GMT (envelope-from git) Date: Tue, 8 Oct 2024 07:07:51 GMT Message-Id: <202410080707.49877pcX051684@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: 62cd7d538d86 - stable/14 - release: basic-cloudinit improve default image List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 62cd7d538d863aefbf0cbe57eca5cc8e86a855c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=62cd7d538d863aefbf0cbe57eca5cc8e86a855c5 commit 62cd7d538d863aefbf0cbe57eca5cc8e86a855c5 Author: Jose Luis Duran AuthorDate: 2024-07-30 04:47:04 +0000 Commit: Baptiste Daroussin CommitDate: 2024-10-08 07:04:02 +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 (cherry picked from commit 120740221fd4a4577e63e6c279f9873cabe449d0) --- 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