diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml index e7b1adf..c0ccfda 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.14" + version: "1.1.15" 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 21c4101..29e9fec 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 @@ -11,7 +11,11 @@ LimitNOFILE=49152 ExecStartPre=-/bin/sh -c "dmesg -D" TTYPath=/dev/tty1 RemainAfterExit=yes +# Stop systemd messages on tty +ExecStartPre=-/usr/bin/kill -SIGRTMIN+21 1 ExecStart=/usr/bin/kairos-agent interactive-install --shell +# 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-recovery.service b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos-recovery.service index 0c9cc2c..aad01f1 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 @@ -8,8 +8,12 @@ StandardOutput=tty LimitNOFILE=49152 ExecStartPre=-/bin/sh -c "dmesg -D" ExecStartPre=-/bin/sh -c "sysctl -w net.core.rmem_max=2500000" +# Stop systemd messages on tty +ExecStartPre=-/usr/bin/kill -SIGRTMIN+21 1 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 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 7bc2762..7d24764 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 @@ -8,7 +8,11 @@ StandardOutput=tty LimitNOFILE=49152 TTYPath=/dev/tty1 RemainAfterExit=yes +# Stop systemd messages on tty +ExecStartPre=-/usr/bin/kill -SIGRTMIN+21 1 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.service b/packages/static/kairos-overlay-files/files/etc/systemd/system/kairos.service index f440582..5a029a7 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 @@ -9,7 +9,11 @@ LimitNOFILE=49152 ExecStartPre=-/bin/sh -c "dmesg -D" TTYPath=/dev/tty1 RemainAfterExit=yes +# Stop systemd messages on tty +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 diff --git a/packages/static/kairos-overlay-files/files/system/oem/50_recovery.yaml b/packages/static/kairos-overlay-files/files/system/oem/50_recovery.yaml index 1f0796e..a5a6f58 100644 --- a/packages/static/kairos-overlay-files/files/system/oem/50_recovery.yaml +++ b/packages/static/kairos-overlay-files/files/system/oem/50_recovery.yaml @@ -7,6 +7,8 @@ stages: ( [ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] ) commands: - systemctl disable getty@tty1 + - systemctl stop getty@tty1 + - systemctl mask getty@tty1 - systemctl enable kairos-recovery - name: "Starts kairos-recovery for openRC based systems" if: grep -q "kairos.remote_recovery_mode" /proc/cmdline && [ -f "/sbin/openrc" ] diff --git a/packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml b/packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml index 12c3bb5..6131665 100644 --- a/packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml +++ b/packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml @@ -5,6 +5,8 @@ stages: if: grep -q "kairos.reset" /proc/cmdline && [ ! -f "/sbin/openrc" ] commands: - systemctl disable getty@tty1 + - systemctl stop getty@tty1 + - systemctl mask getty@tty1 - systemctl enable kairos-reset - name: "Starts kairos-reset for openRC-based systems" if: grep -q "kairos.reset" /proc/cmdline && [ -f "/sbin/openrc" ] diff --git a/packages/static/kairos-overlay-files/files/system/oem/52_installer.yaml b/packages/static/kairos-overlay-files/files/system/oem/52_installer.yaml index 45493c3..ca4ce07 100644 --- a/packages/static/kairos-overlay-files/files/system/oem/52_installer.yaml +++ b/packages/static/kairos-overlay-files/files/system/oem/52_installer.yaml @@ -6,6 +6,8 @@ stages: ( [ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] ) commands: - systemctl disable getty@tty1 + - systemctl stop getty@tty1 + - systemctl mask getty@tty1 - systemctl enable kairos - systemctl enable kairos-webui # Starts installer on boot for openRC based systems @@ -19,6 +21,8 @@ stages: ( [ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] ) commands: - systemctl disable getty@tty1 + - systemctl stop getty@tty1 + - systemctl mask getty@tty1 - systemctl enable kairos-interactive # Starts installer on boot for openRC based systems - if: grep -q "interactive-install" /proc/cmdline && [ -f "/sbin/openrc" ]