Try and do one reboot at the end

This commit is contained in:
2026-02-08 11:06:51 +00:00
parent 7575a1f666
commit 5dfe923110
4 changed files with 5 additions and 8 deletions

View File

@@ -39,7 +39,6 @@ systemd:
ExecStart=/usr/bin/rpm-ostree override remove moby-engine containerd runc docker-cli --install docker-ce 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/touch /var/lib/%N.stamp
ExecStart=/usr/bin/systemctl enable docker.service ExecStart=/usr/bin/systemctl enable docker.service
ExecStart=/usr/bin/systemctl --no-block reboot
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@@ -39,7 +39,7 @@
"systemd": { "systemd": {
"units": [ "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, "enabled": true,
"name": "rpm-ostree-install-docker-ce.service" "name": "rpm-ostree-install-docker-ce.service"
} }

View File

@@ -46,18 +46,17 @@ systemd:
enabled: true enabled: true
contents: | contents: |
[Unit] [Unit]
Description=Enable SSH after configuration Description=Enable SSH after configuration and reboot
After=zincati.service After=zincati.service
ConditionPathExists=!/var/lib/%N.stamp ConditionPathExists=!/var/lib/%N.stamp
[Service] [Service]
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=/usr/bin/systemctl start sshd
ExecStart=/usr/bin/systemctl enable sshd ExecStart=/usr/bin/systemctl enable sshd
ExecStart=/usr/bin/touch /var/lib/%N.stamp ExecStart=/usr/bin/touch /var/lib/%N.stamp
ExecStart=/usr/bin/rm /etc/issue.d/35-ssh-blocked.issue 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] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
@@ -78,7 +77,6 @@ systemd:
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=/usr/bin/rpm-ostree install qemu-guest-agent ExecStart=/usr/bin/rpm-ostree install qemu-guest-agent
ExecStart=/usr/bin/touch /var/lib/%N.stamp ExecStart=/usr/bin/touch /var/lib/%N.stamp
ExecStart=/usr/bin/systemctl --no-block reboot
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@@ -28,12 +28,12 @@
"name": "ignition-start-config.service" "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, "enabled": true,
"name": "ignition-finish-config.service" "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, "enabled": true,
"name": "rpm-ostree-install-qemu-guest-agent.service" "name": "rpm-ostree-install-qemu-guest-agent.service"
} }