Handle multiple public keys correctly

ddterm · Dec 26, 2024 · 57203bc · 57203bc
1 parent 0be719d
commit 57203bc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/fedora.ks b/fedora.ks
@@ -8,7 +8,7 @@ bootloader --location=mbr
 firstboot --disable
 autopart
 user --name=vagrant --groups=wheel --password=vagrant --plaintext
-sshkey --username=vagrant "${trimspace(file("${path.root}/keys/vagrant.pub"))}"
+${join("\n", formatlist("sshkey --username=vagrant \"%s\"", compact(split("\n", file("${path.root}/keys/vagrant.pub")))))}
 reboot
 
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch

diff --git a/silverblue.ks b/silverblue.ks
@@ -8,7 +8,7 @@ bootloader --location=mbr
 firstboot --disable
 autopart
 user --name=vagrant --groups=wheel --password=vagrant --plaintext
-sshkey --username=vagrant "${trimspace(file("${path.root}/keys/vagrant.pub"))}"
+${join("\n", formatlist("sshkey --username=vagrant \"%s\"", compact(split("\n", file("${path.root}/keys/vagrant.pub")))))}
 ostreesetup --osname="fedora-silverblue" --remote="fedora" --url="file:///ostree/repo" --ref="fedora/${version}/x86_64/silverblue" --nogpg
 reboot
 

diff --git a/ubuntu-22.04-autoinstall.yml b/ubuntu-22.04-autoinstall.yml
@@ -15,8 +15,7 @@ autoinstall:
     hostname: ${hostname}
   ssh:
     install-server: yes
-    authorized-keys:
-      - ${trimspace(file("${path.root}/keys/vagrant.pub"))}
+    authorized-keys: ${format("%#v", compact(split("\n", file("${path.root}/keys/vagrant.pub"))))}
     allow-pw: yes
   packages:
     - ubuntu-desktop

diff --git a/ubuntu-autoinstall.yml b/ubuntu-autoinstall.yml
@@ -15,8 +15,7 @@ autoinstall:
     hostname: ${hostname}
   ssh:
     install-server: yes
-    authorized-keys:
-      - ${trimspace(file("${path.root}/keys/vagrant.pub"))}
+    authorized-keys: ${format("%#v", compact(split("\n", file("${path.root}/keys/vagrant.pub"))))}
     allow-pw: yes
   packages:
     - qemu-guest-agent