From bf2f6de39ded3be2c9e929f1081503dc936730a6 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:13:34 +0100 Subject: [PATCH] nixos/etc-activation: only assert for 6.6 kernel in switchable systems The assertion is based on the availability of `move-mount-beneath`, which is only used in re-activation logic for switchable systems. Systems that have `system.switch.enable == false` should be allowed to user older kernels. --- nixos/modules/system/etc/etc-activation.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix index aed58af780b7..47c65590e0c4 100644 --- a/nixos/modules/system/etc/etc-activation.nix +++ b/nixos/modules/system/etc/etc-activation.nix @@ -32,8 +32,10 @@ message = "`!system.etc.overlay.mutable` requires `systemd.sysusers.enable` or `services.userborn.enable`"; } { - assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.6"; - message = "`system.etc.overlay.enable requires a newer kernel, at least version 6.6"; + assertion = + (config.system.switch.enable) + -> (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.6"); + message = "switchable systems with `system.etc.overlay.enable` require a newer kernel, at least version 6.6"; } ];