clerie/nixfiles
1
0
Fork 0
Code Activity

modules/clerie-system-upgrade: Always reboot after an update

Browse Source
This commit is contained in:
clerie
2025-06-30 18:35:57 +02:00
parent 4245ae84ed
commit 43d1133772
9 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/dn42-il-gw1/configuration.nix
View File

@ -238,7 +238,6 @@
};
clerie.system-auto-upgrade = {
allowReboot = true;
autoUpgrade = true;
};

1
hosts/dn42-il-gw5/configuration.nix
View File

@ -112,7 +112,6 @@
};
clerie.system-auto-upgrade = {
allowReboot = true;
autoUpgrade = true;
startAt = "*-*-* 06:22:00";
};

1
hosts/dn42-il-gw6/configuration.nix
View File

@ -106,7 +106,6 @@
};
clerie.system-auto-upgrade = {
allowReboot = true;
autoUpgrade = true;
startAt = "*-*-* 07:22:00";
};

1
hosts/dn42-ildix-clerie/configuration.nix
View File

@ -162,7 +162,6 @@
'';
clerie.system-auto-upgrade = {
allowReboot = true;
autoUpgrade = true;
};

1
hosts/dn42-ildix-service/configuration.nix
View File

@ -71,7 +71,6 @@
networking.firewall.allowedTCPPorts = [ 80 443 ];
clerie.system-auto-upgrade = {
allowReboot = true;
autoUpgrade = true;
};

1
hosts/nonat/configuration.nix
View File

@ -42,7 +42,6 @@
networking.firewall.allowedUDPPorts = [];
clerie.system-auto-upgrade = {
allowReboot = true;
autoUpgrade = true;
};

1
hosts/storage-2/configuration.nix
View File

@ -53,7 +53,6 @@
};
clerie.system-auto-upgrade = {
allowReboot = true;
autoUpgrade = true;
};

7
modules/clerie-system-upgrade/default.nix
View File

@ -10,11 +10,6 @@ in
options = {
clerie.system-auto-upgrade = {
enable = mkEnableOption "clerie system upgrade";
allowReboot = mkOption {
type = types.bool;
default = false;
description = "Monitor NixOS";
};
autoUpgrade = mkOption {
type = types.bool;
default = false;
@ -38,7 +33,7 @@ in
serviceConfig = {
Type = "oneshot";
ExecStart = pkgs.clerie-system-upgrade + "/bin/clerie-system-upgrade --no-confirm${optionalString cfg.allowReboot " --allow-reboot"}${optionalString (config.clerie.monitoring.enable) " --node-exporter-metrics-path /var/lib/prometheus-node-exporter/textfiles/clerie-system-upgrade.prom"}";
ExecStart = pkgs.clerie-system-upgrade + "/bin/clerie-system-upgrade --no-confirm${optionalString (config.clerie.monitoring.enable) " --node-exporter-metrics-path /var/lib/prometheus-node-exporter/textfiles/clerie-system-upgrade.prom"}";
};
};
systemd.timers.clerie-system-auto-upgrade = mkIf cfg.autoUpgrade {

14
pkgs/clerie-system-upgrade/clerie-system-upgrade.sh
View File

@ -2,16 +2,11 @@
set -euo pipefail
ALLOW_REBOOT=
NO_CONFIRM=
NODE_EXPORTER_METRICS_PATH=
while [[ $# -gt 0 ]]; do
case $1 in
--allow-reboot)
ALLOW_REBOOT=1
shift
;;
--no-confirm)
NO_CONFIRM=1
shift
@ -63,13 +58,8 @@ ACTIVATING_SYSTEM_KERNEL="$(readlink /nix/var/nix/profiles/system/{initrd,kernel
if [[ "$BOOTED_SYSTEM_KERNEL" != "$ACTIVATING_SYSTEM_KERNEL" ]]; then
echo "Reboot is required"
if [[ -n "$ALLOW_REBOOT" ]]; then
echo "Rebooting system now"
shutdown -r +1 "System update requires reboot"
else
echo "Automatic reboot not allowed (maybe use --allow-reboot next time)"
echo "The system upgrade is staged, please reboot manually soon"
fi
echo "Rebooting system now"
shutdown -r +1 "System update requires reboot"
else
echo "No reboot is required"
echo "Activating system now"