Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Sep 2024 11:06:22 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 120740221fd4 - main - release: basic-cloudinit improve default image
Message-ID:  <202409261106.48QB6Mmn063675@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=120740221fd4a4577e63e6c279f9873cabe449d0

commit 120740221fd4a4577e63e6c279f9873cabe449d0
Author:     Jose Luis Duran <jlduran@gmail.com>
AuthorDate: 2024-07-30 04:47:04 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
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 <jlduran@gmail.com>
---
 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 <<EOF >> ${DESTDIR}/etc/ssh/sshd_config
+
+	cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config
 PasswordAuthentication yes
 UsePAM no
 EOF



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409261106.48QB6Mmn063675>