Merge commit '62eab74e55ac5346441fb24094bbf8035465c2b1'

alpine-cloud-images/build

@@ -198,7 +198,7 @@ def install_qemu_firmware():
 
         firm_bin = os.path.join(firm_dir, f"uefi-{arch}.bin")
         os.symlink(bin, firm_bin)
-        if args.pad_uefi_bins:
+        if arch in args.pad_uefi_bin_arch:
             log.info('Padding "%s" to 67108864 bytes', firm_bin)
             subprocess.run(['truncate', '-s', '67108864', firm_bin])
 
@@ -213,8 +213,8 @@ parser.add_argument(
 parser.add_argument(
     '--clean', action='store_true', help='start with a clean work environment')
 parser.add_argument(
-    '--pad-uefi-bins', action=argparse.BooleanOptionalAction, default=True,
-    help='pad out UEFI firmware binaries to 64 MiB')
+    '--pad-uefi-bin-arch', metavar='ARCH', nargs='+', action=remove_dupe_args(),
+    default=['aarch64'], help='pad out UEFI firmware binaries to 64 MiB')
 # config options
 parser.add_argument(
     '--custom', metavar='DIR', nargs='+', action=are_args_valid(os.path.isdir),

alpine-cloud-images/configs/alpine.conf

@@ -54,10 +54,10 @@ Default {
 # profile build matrix
 Dimensions {
   version {
+    "3.17"  { include required("version/3.17.conf") }
     "3.16"  { include required("version/3.16.conf") }
     "3.15"  { include required("version/3.15.conf") }
     "3.14"  { include required("version/3.14.conf") }
-    "3.13"  { include required("version/3.13.conf") }
     edge    { include required("version/edge.conf") }
   }
   arch {

alpine-cloud-images/configs/bootstrap/cloudinit.conf

@@ -8,6 +8,7 @@ EXCLUDE = ["3.12", "3.13", "3.14"]
 
 packages {
   cloud-init          = true
+  dhclient            = true  # offically supported, for now
   openssh-server-pam  = true
   e2fsprogs-extra     = true  # for resize2fs
 }

alpine-cloud-images/configs/version/3.17.conf

@@ -0,0 +1,7 @@
+# vim: ts=2 et:
+
+include required("base/4.conf")
+
+motd {
+  sudo_removed = "NOTE: 'sudo' is not installed by default, please use 'doas' instead."
+}