autoprovision.ks

@@ -1,3 +1,26 @@
+%post
+cat > /root/.ssh/authorized_keys <<EOF
+expiry-time="$(date -d +1hour +%Y%m%d%H%M)",restrict,pty ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICoOO/ZYMxRgmyvqZwGN3NM5pHyh3NBdC7iZrXIopt93 Host Provisioner
+EOF
+
+cat > /usr/local/libexec/notify-online.sh <<'EOF'
+#!/bin/sh
+
+set -- \
+    -F "hostname=$(hostname -f)" \
+    -F 'sshkeys=<-;type=text/plain'
+
+fw_cfg=/sys/firmware/qemu_fw_cfg/by_name/opt/dch/cfg-branch/raw
+if [ -r "${fw_cfg}" ]; then
+    set -- "$@" -F branch="$(cat "${fw_cfg}")"
+fi
+
+cat /etc/ssh/ssh_host_*_key.pub \
+| curl -fsS https://webhooks.pyrocufflink.blue/host/online "$@"
+EOF
+chmod +x /usr/local/libexec/notify-online.sh
+
+cat > /etc/systemd/system/notify-online.service <<'EOF'
 [Unit]
 Description=Notify infrastructure services that this host is online
 ConditionFirstBoot=yes
@@ -40,3 +63,7 @@ SystemCallFilter=~@privileged @resources
 
 [Install]
 WantedBy=multi-user.target
+EOF
+
+systemctl enable --no-reload notify-online.service
+%end

autoprovision.ks.j2

@@ -1,16 +0,0 @@
-%post
-cat > /root/.ssh/authorized_keys <<EOF
-expiry-time="$(date -d +1hour +%Y%m%d%H%M)",restrict,pty ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICoOO/ZYMxRgmyvqZwGN3NM5pHyh3NBdC7iZrXIopt93 Host Provisioner
-EOF
-
-cat > /usr/local/libexec/notify-online.sh <<'EOF'
-{% include "notify-online.sh" %}
-EOF
-chmod +x /usr/local/libexec/notify-online.sh
-
-cat > /etc/systemd/system/notify-online.service <<'EOF'
-{% include "notify-online.service" %}
-EOF
-
-systemctl enable --no-reload notify-online.service
-%end

fedora-common.ks

@@ -13,6 +13,7 @@ reboot
 -NetworkManager
 -authconfig
 -dhcp-client
+-dnf-plugins-core
 -dnf-yum
 -dracut-config-rescue
 -man-db
@@ -26,17 +27,15 @@ reboot
 -yum
 chrony
 dnf
-dnf-command(system-upgrade)
 e2fsprogs
 grubby
 kitty-terminfo
 openssh-server
-python3-libdnf5
 python3-libselinux
 python3-policycoreutils
 rng-tools
 selinux-policy-targeted
-sshca-cli
+sshca-cli-systemd
 systemd-networkd
 %end
 

fedora-rpi.ks.j2

@@ -2,4 +2,4 @@
 ignoredisk --only-use /dev/mmcblk0
 {% include "fedora-disk-dch.ks" %}
 {% include "fedora-rpi-common.ks.j2" %}
-{% include "autoprovision.ks.j2" %}
+{% include "autoprovision.ks" %}

fedora.ks.j2

@@ -16,4 +16,4 @@ qemu-guest-agent
 -fwupd
 %end
 
-{% include "autoprovision.ks.j2" %}
+{% include "autoprovision.ks" %}

notify-online.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -- \
-    -F "hostname=$(hostname -f)" \
-    -F 'sshkeys=<-;type=text/plain'
-
-fw_cfg=/sys/firmware/qemu_fw_cfg/by_name/opt/dch/cfg-branch/raw
-if [ -r "${fw_cfg}" ]; then
-    set -- "$@" -F branch="$(cat "${fw_cfg}")"
-fi
-
-cat /etc/ssh/ssh_host_*_key.pub \
-    | curl -fsS https://webhooks.pyrocufflink.blue/host/online "$@"