From 62eab74e55ac5346441fb24094bbf8035465c2b1 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Sun, 13 Nov 2022 14:32:40 +0100
Subject: [PATCH] Squashed 'alpine-cloud-images/' changes from 42eed74..eaf401c

eaf401c Fix CloudInit Boot Times
d40b373 Add Alpine 3.17, Remove Alpine 3.13

git-subtree-dir: alpine-cloud-images
git-subtree-split: eaf401c7e8cea77685cde95411139b997a9d501c
---
 build                            | 6 +++---
 configs/alpine.conf              | 2 +-
 configs/bootstrap/cloudinit.conf | 1 +
 configs/version/3.17.conf        | 7 +++++++
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 configs/version/3.17.conf

diff --git a/build b/build
index bd528ff..250bd96 100755
--- a/build
+++ b/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),
diff --git a/configs/alpine.conf b/configs/alpine.conf
index 1b6dec6..d8b30c4 100644
--- a/configs/alpine.conf
+++ b/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 {
diff --git a/configs/bootstrap/cloudinit.conf b/configs/bootstrap/cloudinit.conf
index bfaf981..07abbcf 100644
--- a/configs/bootstrap/cloudinit.conf
+++ b/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
 }
diff --git a/configs/version/3.17.conf b/configs/version/3.17.conf
new file mode 100644
index 0000000..7fc3e7d
--- /dev/null
+++ b/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."
+}