From 5dfe9231108af18d8a2f6386c258afcaf983ab83 Mon Sep 17 00:00:00 2001 From: MrMeeb Date: Sun, 8 Feb 2026 11:06:51 +0000 Subject: [PATCH] Try and do one reboot at the end --- ignition/base-install-docker.bu | 1 - ignition/base-install-docker.ign | 2 +- ignition/base.bu | 6 ++---- ignition/base.ign | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ignition/base-install-docker.bu b/ignition/base-install-docker.bu index 2739f4d..a7a4a56 100644 --- a/ignition/base-install-docker.bu +++ b/ignition/base-install-docker.bu @@ -39,7 +39,6 @@ systemd: ExecStart=/usr/bin/rpm-ostree override remove moby-engine containerd runc docker-cli --install docker-ce ExecStart=/usr/bin/touch /var/lib/%N.stamp ExecStart=/usr/bin/systemctl enable docker.service - ExecStart=/usr/bin/systemctl --no-block reboot [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/ignition/base-install-docker.ign b/ignition/base-install-docker.ign index e91d783..35a592b 100644 --- a/ignition/base-install-docker.ign +++ b/ignition/base-install-docker.ign @@ -39,7 +39,7 @@ "systemd": { "units": [ { - "contents": "[Unit]\nDescription=Install Docker CE\nWants=network-online.target\nAfter=ignition-start-config.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/curl --output-dir \"/etc/yum.repos.d\" --remote-name https://download.docker.com/linux/fedora/docker-ce.repo\nExecStart=/usr/bin/rpm-ostree override remove moby-engine containerd runc docker-cli --install docker-ce\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/systemctl enable docker.service\nExecStart=/usr/bin/systemctl --no-block reboot\n\n[Install]\nWantedBy=multi-user.target", + "contents": "[Unit]\nDescription=Install Docker CE\nWants=network-online.target\nAfter=ignition-start-config.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/curl --output-dir \"/etc/yum.repos.d\" --remote-name https://download.docker.com/linux/fedora/docker-ce.repo\nExecStart=/usr/bin/rpm-ostree override remove moby-engine containerd runc docker-cli --install docker-ce\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/systemctl enable docker.service\n\n[Install]\nWantedBy=multi-user.target", "enabled": true, "name": "rpm-ostree-install-docker-ce.service" } diff --git a/ignition/base.bu b/ignition/base.bu index 9532814..debe295 100644 --- a/ignition/base.bu +++ b/ignition/base.bu @@ -46,18 +46,17 @@ systemd: enabled: true contents: | [Unit] - Description=Enable SSH after configuration + Description=Enable SSH after configuration and reboot After=zincati.service ConditionPathExists=!/var/lib/%N.stamp [Service] Type=oneshot RemainAfterExit=yes - ExecStart=/usr/bin/systemctl start sshd ExecStart=/usr/bin/systemctl enable sshd ExecStart=/usr/bin/touch /var/lib/%N.stamp ExecStart=/usr/bin/rm /etc/issue.d/35-ssh-blocked.issue - ExecStart=/usr/bin/systemctl restart getty@tty1 + ExecStart=/usr/bin/systemctl --no-block reboot [Install] WantedBy=multi-user.target @@ -78,7 +77,6 @@ systemd: RemainAfterExit=yes ExecStart=/usr/bin/rpm-ostree install qemu-guest-agent ExecStart=/usr/bin/touch /var/lib/%N.stamp - ExecStart=/usr/bin/systemctl --no-block reboot [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/ignition/base.ign b/ignition/base.ign index c4b70fa..6e28d7b 100644 --- a/ignition/base.ign +++ b/ignition/base.ign @@ -28,12 +28,12 @@ "name": "ignition-start-config.service" }, { - "contents": "[Unit]\nDescription=Enable SSH after configuration\nAfter=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/systemctl start sshd\nExecStart=/usr/bin/systemctl enable sshd\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/rm /etc/issue.d/35-ssh-blocked.issue\nExecStart=/usr/bin/systemctl restart getty@tty1\n\n[Install]\nWantedBy=multi-user.target\n", + "contents": "[Unit]\nDescription=Enable SSH after configuration and reboot\nAfter=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/systemctl enable sshd\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/rm /etc/issue.d/35-ssh-blocked.issue\nExecStart=/usr/bin/systemctl --no-block reboot\n\n[Install]\nWantedBy=multi-user.target\n", "enabled": true, "name": "ignition-finish-config.service" }, { - "contents": "[Unit]\nDescription=Install QEMU Guest Agent\nWants=network-online.target\nAfter=ignition-start-config.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/rpm-ostree install qemu-guest-agent\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/systemctl --no-block reboot\n\n[Install]\nWantedBy=multi-user.target", + "contents": "[Unit]\nDescription=Install QEMU Guest Agent\nWants=network-online.target\nAfter=ignition-start-config.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/rpm-ostree install qemu-guest-agent\nExecStart=/usr/bin/touch /var/lib/%N.stamp\n\n[Install]\nWantedBy=multi-user.target", "enabled": true, "name": "rpm-ostree-install-qemu-guest-agent.service" }