diff options
author | Patryk Wychowaniec <pwychowaniec@pm.me> | 2022-12-23 21:23:36 +0100 |
---|---|---|
committer | Patryk Wychowaniec <pwychowaniec@pm.me> | 2023-01-15 18:16:49 +0100 |
commit | 2c55eba8f4604d1eef22f7bfd7df01312fe07272 (patch) | |
tree | fd0cf784c145f78b4321fb3b5069e49e5cf6c9ad /nixos/tests | |
parent | 65e07f20cf04f5db9921dcfa202591997e0f7cd2 (diff) |
nixos: add --specialisation to nixos-rebuild
This commit fixes a papercut in nixos-rebuild where people wanting to switch to a specialisation (or test one) were forced to manually figure out the specialisation's path and run its activation script - since now, there's a dedicated option to do just that. This is a backwards-compatible change which doesn't affect the existing behavior, which - to be fair - might still be considered sus by some people, the painful scenario here being: - you boot into specialisation `foo`, - you run `nixos-rebuild switch`, - whoops, you're no longer at specialisation `foo`, but you're rather brought back to the base system. (it's especially painful for cases where specialisation is used to load extra drivers, e.g. Nvidia, since then launching `nixos-rebuild switch`, while forgetting that you're inside a specialisation, can cause some parts of your system to get accidentally unloaded.) I've tried to mitigate that by improving specialisations so that they create a dedicated file somewhere in `/run/current-system` containing the specialisation's name (which `nixos-rebuild` could then use as the default value for `--specialisation`), but I haven't been able to come up with anything working (plus it would be a breaking change then). Closes https://github.com/NixOS/nixpkgs/issues/174065
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/all-tests.nix | 2 | ||||
-rw-r--r-- | nixos/tests/nixos-rebuild-specialisations.nix | 131 | ||||
-rw-r--r-- | nixos/tests/specialisation.nix | 43 |
3 files changed, 132 insertions, 44 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index acc42acf37a6a..35d0fc0b97849 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -436,7 +436,6 @@ in { netdata = handleTest ./netdata.nix {}; networking.networkd = handleTest ./networking.nix { networkd = true; }; networking.scripted = handleTest ./networking.nix { networkd = false; }; - specialisation = handleTest ./specialisation.nix {}; netbox = handleTest ./web-apps/netbox.nix {}; # TODO: put in networking.nix after the test becomes more complete networkingProxy = handleTest ./networking-proxy.nix {}; @@ -464,6 +463,7 @@ in { nix-serve-ssh = handleTest ./nix-serve-ssh.nix {}; nixops = handleTest ./nixops/default.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; + nixos-rebuild-specialisations = handleTest ./nixos-rebuild-specialisations.nix {}; nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; node-red = handleTest ./node-red.nix {}; nomad = handleTest ./nomad.nix {}; diff --git a/nixos/tests/nixos-rebuild-specialisations.nix b/nixos/tests/nixos-rebuild-specialisations.nix new file mode 100644 index 0000000000000..c61f81b8ca656 --- /dev/null +++ b/nixos/tests/nixos-rebuild-specialisations.nix @@ -0,0 +1,131 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "nixos-rebuild-specialisations"; + + nodes = { + machine = { lib, pkgs, ... }: { + imports = [ + ../modules/profiles/installation-device.nix + ../modules/profiles/base.nix + ]; + + nix.settings = { + substituters = lib.mkForce [ ]; + hashed-mirrors = null; + connect-timeout = 1; + }; + + system.extraDependencies = with pkgs; [ + curl + desktop-file-utils + docbook5 + docbook_xsl_ns + grub2 + kmod.dev + libarchive + libarchive.dev + libxml2.bin + libxslt.bin + python3Minimal + shared-mime-info + stdenv + sudo + xorg.lndir + ]; + + virtualisation = { + cores = 2; + memorySize = 2048; + }; + }; + }; + + testScript = + let + configFile = pkgs.writeText "configuration.nix" '' + { lib, pkgs, ... }: { + imports = [ + ./hardware-configuration.nix + <nixpkgs/nixos/modules/testing/test-instrumentation.nix> + ]; + + boot.loader.grub = { + enable = true; + device = "/dev/vda"; + forceInstall = true; + }; + + documentation.enable = false; + + environment.systemPackages = [ + (pkgs.writeShellScriptBin "parent" "") + ]; + + specialisation.foo = { + inheritParentConfig = true; + + configuration = { ... }: { + environment.systemPackages = [ + (pkgs.writeShellScriptBin "foo" "") + ]; + }; + }; + + specialisation.bar = { + inheritParentConfig = true; + + configuration = { ... }: { + environment.systemPackages = [ + (pkgs.writeShellScriptBin "bar" "") + ]; + }; + }; + } + ''; + + in + '' + machine.start() + machine.succeed("udevadm settle") + machine.wait_for_unit("multi-user.target") + + machine.succeed("nixos-generate-config") + machine.copy_from_host( + "${configFile}", + "/etc/nixos/configuration.nix", + ) + + with subtest("Switch to the base system"): + machine.succeed("nixos-rebuild switch") + machine.succeed("parent") + machine.fail("foo") + machine.fail("bar") + + with subtest("Switch from base system into a specialization"): + machine.succeed("nixos-rebuild switch --specialisation foo") + machine.succeed("parent") + machine.succeed("foo") + machine.fail("bar") + + with subtest("Switch from specialization into another specialization"): + machine.succeed("nixos-rebuild switch -c bar") + machine.succeed("parent") + machine.fail("foo") + machine.succeed("bar") + + with subtest("Switch from specialization into the base system"): + machine.succeed("nixos-rebuild switch") + machine.succeed("parent") + machine.fail("foo") + machine.fail("bar") + + with subtest("Switch into specialization using `nixos-rebuild test`"): + machine.succeed("nixos-rebuild test --specialisation foo") + machine.succeed("parent") + machine.succeed("foo") + machine.fail("bar") + + with subtest("Make sure nonsense command combinations are forbidden"): + machine.fail("nixos-rebuild boot --specialisation foo") + machine.fail("nixos-rebuild boot -c foo") + ''; +}) diff --git a/nixos/tests/specialisation.nix b/nixos/tests/specialisation.nix deleted file mode 100644 index b8d4b8279f4da..0000000000000 --- a/nixos/tests/specialisation.nix +++ /dev/null @@ -1,43 +0,0 @@ -import ./make-test-python.nix { - name = "specialisation"; - nodes = { - inheritconf = { pkgs, ... }: { - environment.systemPackages = [ pkgs.cowsay ]; - specialisation.inheritconf.configuration = { pkgs, ... }: { - environment.systemPackages = [ pkgs.hello ]; - }; - }; - noinheritconf = { pkgs, ... }: { - environment.systemPackages = [ pkgs.cowsay ]; - specialisation.noinheritconf = { - inheritParentConfig = false; - configuration = { pkgs, ... }: { - environment.systemPackages = [ pkgs.hello ]; - }; - }; - }; - }; - testScript = '' - inheritconf.wait_for_unit("default.target") - inheritconf.succeed("cowsay hey") - inheritconf.fail("hello") - - with subtest("Nested clones do inherit from parent"): - inheritconf.succeed( - "/run/current-system/specialisation/inheritconf/bin/switch-to-configuration test" - ) - inheritconf.succeed("cowsay hey") - inheritconf.succeed("hello") - - noinheritconf.wait_for_unit("default.target") - noinheritconf.succeed("cowsay hey") - noinheritconf.fail("hello") - - with subtest("Nested children do not inherit from parent"): - noinheritconf.succeed( - "/run/current-system/specialisation/noinheritconf/bin/switch-to-configuration test" - ) - noinheritconf.fail("cowsay hey") - noinheritconf.succeed("hello") - ''; -} |