From 16b1d80dcbc1b98ddac0a2cbde68ef50b7c14a14 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Fri, 2 Aug 2024 11:59:49 +0200 Subject: [PATCH] Protect against first boot shenanigans (#1000) --- packages/static/kairos-overlay-files/collection.yaml | 2 +- .../files/etc/systemd/system/kairos-agent.service | 4 +--- .../files/etc/systemd/system/kairos-interactive.service | 2 -- .../files/etc/systemd/system/kairos-recovery.service | 4 +--- .../files/etc/systemd/system/kairos-reset.service | 2 -- .../files/etc/systemd/system/kairos-webui.service | 4 +--- .../files/etc/systemd/system/kairos.service | 4 +--- 7 files changed, 5 insertions(+), 17 deletions(-) diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml index 9c9bdc7..fd80a3f 100644 --- a/packages/static/kairos-overlay-files/collection.yaml +++ b/packages/static/kairos-overlay-files/collection.yaml @@ -1,4 +1,4 @@ packages: - name: "kairos-overlay-files" category: "static" - version: "1.1.43" + version: "1.1.44" diff --git a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-agent.service b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-agent.service index fbaec01..5d3489b 100644 --- a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-agent.service +++ b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-agent.service @@ -5,6 +5,4 @@ Wants=network.target [Service] Restart=on-failure RestartSec=5s -ExecStart=/usr/bin/kairos-agent start -[Install] -WantedBy=multi-user.target +ExecStart=/usr/bin/kairos-agent start \ No newline at end of file diff --git a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-interactive.service b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-interactive.service index a8da4c8..a2c882a 100644 --- a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-interactive.service +++ b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-interactive.service @@ -20,5 +20,3 @@ ExecStartPost=-/usr/bin/kill -SIGRTMIN+20 1 TimeoutStopSec=10s # Restart if it fails, like user doing control+c Restart=on-failure -[Install] -WantedBy=multi-user.target diff --git a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-recovery.service b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-recovery.service index 4717b64..e7c3973 100644 --- a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-recovery.service +++ b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-recovery.service @@ -14,6 +14,4 @@ TTYPath=/dev/tty1 RemainAfterExit=yes ExecStart=/usr/bin/kairos-agent recovery # Start systemd messages on tty -ExecStartPost=-/usr/bin/kill -SIGRTMIN+20 1 -[Install] -WantedBy=multi-user.target +ExecStartPost=-/usr/bin/kill -SIGRTMIN+20 1 \ No newline at end of file diff --git a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-reset.service b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-reset.service index 7d24764..ed7bba6 100644 --- a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-reset.service +++ b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-reset.service @@ -14,5 +14,3 @@ ExecStart=/usr/bin/kairos-agent reset --unattended --reboot # Start systemd messages on tty ExecStartPost=-/usr/bin/kill -SIGRTMIN+20 1 TimeoutStopSec=10s -[Install] -WantedBy=multi-user.target diff --git a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-webui.service b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-webui.service index 23f0f99..b7bc684 100644 --- a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-webui.service +++ b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-webui.service @@ -3,6 +3,4 @@ Description=kairos installer After=sysinit.target [Service] ExecStart=/usr/bin/kairos-agent webui -TimeoutStopSec=10s -[Install] -WantedBy=multi-user.target +TimeoutStopSec=10s \ No newline at end of file diff --git a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos.service b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos.service index 3a09fe3..a59d4bc 100644 --- a/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos.service +++ b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos.service @@ -14,6 +14,4 @@ ExecStartPre=-/usr/bin/kill -SIGRTMIN+21 1 ExecStart=/usr/bin/kairos-agent install # Start systemd messages on tty ExecStartPost=-/usr/bin/kill -SIGRTMIN+20 1 -TimeoutStopSec=10s -[Install] -WantedBy=multi-user.target +TimeoutStopSec=10s \ No newline at end of file