Unverified Commit 32bf051b authored by Jared Baur's avatar Jared Baur
Browse files

nixos/switch-to-configuration: add new implementation 

This adds an implementation of switch-to-configuration that allows for
closer interaction with the lifecycle of systemd units by using DBus
APIs directly instead of using systemctl. It is disabled by default, but
can be enabled by specifying `{ system.switch = { enable = false; enableNg = true; }; }`.
parent e21dccc5

nixos/modules/system/activation/switchable-system.nix

+75 −34
Original line number Diff line number Diff line
@@ -4,27 +4,48 @@ let 


  perlWrapped = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]);



  description = extra: ''

    Whether to include the capability to switch configurations.



    Disabling this makes the system unable to be reconfigured via `nixos-rebuild`.



    ${extra}

  '';



in



{



  options = {

    system.switch.enable = lib.mkOption {

  options.system.switch = {

    enable = lib.mkOption {

      type = lib.types.bool;

      default = true;

      description = ''

        Whether to include the capability to switch configurations.



        Disabling this makes the system unable to be reconfigured via `nixos-rebuild`.



      description = description ''

        This is good for image based appliances where updates are handled

        outside the image. Reducing features makes the image lighter and

        slightly more secure.

      '';

    };



    enableNg = lib.mkOption {

      type = lib.types.bool;

      default = false;

      description = description ''

        Whether to use `switch-to-configuration-ng`, an experimental

        re-implementation of `switch-to-configuration` with the goal of

        replacing the original.

      '';

    };

  };



  config = lib.mkIf config.system.switch.enable {

  config = lib.mkMerge [

    {

      assertions = [{

        assertion = with config.system.switch; enable -> !enableNg;

        message = "Only one of system.switch.enable and system.switch.enableNg may be enabled at a time";

      }];

    }

    (lib.mkIf config.system.switch.enable {

      system.activatableSystemBuilderCommands = ''

        mkdir $out/bin

        substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \
@@ -50,6 +71,26 @@ in 
          fi

        ''}

      '';

  };

    })

    (lib.mkIf config.system.switch.enableNg {

      # Use a subshell so we can source makeWrapper's setup hook without

      # affecting the rest of activatableSystemBuilderCommands.

      system.activatableSystemBuilderCommands = ''

        (

          source ${pkgs.buildPackages.makeWrapper}/nix-support/setup-hook



          mkdir $out/bin

          ln -sf ${lib.getExe pkgs.switch-to-configuration-ng} $out/bin/switch-to-configuration

          wrapProgram $out/bin/switch-to-configuration \

            --set OUT $out \

            --set TOPLEVEL ''${!toplevelVar} \

            --set DISTRO_ID ${lib.escapeShellArg config.system.nixos.distroId} \

            --set INSTALL_BOOTLOADER ${lib.escapeShellArg config.system.build.installBootLoader} \

            --set LOCALE_ARCHIVE ${config.i18n.glibcLocales}/lib/locale/locale-archive \

            --set SYSTEMD ${config.systemd.package}

        )

      '';

    })

  ];



}

nixos/tests/all-tests.nix

+2 −1
Original line number Diff line number Diff line
@@ -871,7 +871,8 @@ in { 
  swap-random-encryption = handleTest ./swap-random-encryption.nix {};

  sway = handleTest ./sway.nix {};

  swayfx = handleTest ./swayfx.nix {};

  switchTest = handleTest ./switch-test.nix {};

  switchTest = handleTest ./switch-test.nix { ng = false; };

  switchTestNg = handleTest ./switch-test.nix { ng = true; };

  sympa = handleTest ./sympa.nix {};

  syncthing = handleTest ./syncthing.nix {};

  syncthing-no-settings = handleTest ./syncthing-no-settings.nix {};

nixos/tests/switch-test.nix

+6 −1
Original line number Diff line number Diff line 
# Test configuration switching.



import ./make-test-python.nix ({ lib, pkgs, ...} : let

import ./make-test-python.nix ({ lib, pkgs, ng, ...} : let



  # Simple service that can either be socket-activated or that will

  # listen on port 1234 if not socket-activated.
@@ -48,6 +48,11 @@ in { 


  nodes = {

    machine = { pkgs, lib, ... }: {

      system.switch = {

        enable = !ng;

        enableNg = ng;

      };



      environment.systemPackages = [ pkgs.socat ]; # for the socket activation stuff

      users.mutableUsers = false;

pkgs/by-name/sw/switch-to-configuration-ng/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
/target

pkgs/by-name/sw/switch-to-configuration-ng/Cargo.lock

0 → 100644
+527 −0
Original line number Diff line number Diff line 
# This file is automatically @generated by Cargo.

# It is not intended for manual editing.

version = 3



[[package]]

name = "aho-corasick"

version = "1.1.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"

dependencies = [

 "memchr",

]



[[package]]

name = "ansi_term"

version = "0.12.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"

dependencies = [

 "winapi",

]



[[package]]

name = "anyhow"

version = "1.0.82"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"



[[package]]

name = "atty"

version = "0.2.14"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"

dependencies = [

 "hermit-abi",

 "libc",

 "winapi",

]



[[package]]

name = "bitflags"

version = "1.3.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"



[[package]]

name = "bitflags"

version = "2.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"



[[package]]

name = "cfg-if"

version = "1.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"



[[package]]

name = "cfg_aliases"

version = "0.1.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"



[[package]]

name = "clap"

version = "2.34.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"

dependencies = [

 "ansi_term",

 "atty",

 "bitflags 1.3.2",

 "strsim",

 "textwrap",

 "unicode-width",

 "vec_map",

]



[[package]]

name = "const-random"

version = "0.1.18"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"

dependencies = [

 "const-random-macro",

]



[[package]]

name = "const-random-macro"

version = "0.1.16"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"

dependencies = [

 "getrandom",

 "once_cell",

 "tiny-keccak",

]



[[package]]

name = "crunchy"

version = "0.2.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"



[[package]]

name = "dbus"

version = "0.9.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"

dependencies = [

 "libc",

 "libdbus-sys",

 "winapi",

]



[[package]]

name = "dbus-codegen"

version = "0.11.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "bcd91775d91fc83c7d526aa7c08078bac0b30f382706689901ac819fe6ddc812"

dependencies = [

 "clap",

 "dbus",

 "xml-rs",

]



[[package]]

name = "deranged"

version = "0.3.11"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"

dependencies = [

 "powerfmt",

]



[[package]]

name = "dlv-list"

version = "0.5.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"

dependencies = [

 "const-random",

]



[[package]]

name = "error-chain"

version = "0.12.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"

dependencies = [

 "version_check",

]



[[package]]

name = "getrandom"

version = "0.2.14"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"

dependencies = [

 "cfg-if",

 "libc",

 "wasi",

]



[[package]]

name = "glob"

version = "0.3.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"



[[package]]

name = "hashbrown"

version = "0.14.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"



[[package]]

name = "hermit-abi"

version = "0.1.19"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"

dependencies = [

 "libc",

]



[[package]]

name = "hostname"

version = "0.3.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"

dependencies = [

 "libc",

 "match_cfg",

 "winapi",

]



[[package]]

name = "itoa"

version = "1.0.11"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"



[[package]]

name = "libc"

version = "0.2.154"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"



[[package]]

name = "libdbus-sys"

version = "0.2.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"

dependencies = [

 "pkg-config",

]



[[package]]

name = "log"

version = "0.4.21"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"



[[package]]

name = "match_cfg"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"



[[package]]

name = "memchr"

version = "2.7.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"



[[package]]

name = "nix"

version = "0.28.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"

dependencies = [

 "bitflags 2.5.0",

 "cfg-if",

 "cfg_aliases",

 "libc",

]



[[package]]

name = "num-conv"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"



[[package]]

name = "num_threads"

version = "0.1.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"

dependencies = [

 "libc",

]



[[package]]

name = "once_cell"

version = "1.19.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"



[[package]]

name = "ordered-multimap"

version = "0.7.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"

dependencies = [

 "dlv-list",

 "hashbrown",

]



[[package]]

name = "pkg-config"

version = "0.3.30"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"



[[package]]

name = "powerfmt"

version = "0.2.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"



[[package]]

name = "proc-macro2"

version = "1.0.81"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"

dependencies = [

 "unicode-ident",

]



[[package]]

name = "quote"

version = "1.0.36"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"

dependencies = [

 "proc-macro2",

]



[[package]]

name = "regex"

version = "1.10.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"

dependencies = [

 "aho-corasick",

 "memchr",

 "regex-automata",

 "regex-syntax",

]



[[package]]

name = "regex-automata"

version = "0.4.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"

dependencies = [

 "aho-corasick",

 "memchr",

 "regex-syntax",

]



[[package]]

name = "regex-syntax"

version = "0.8.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"



[[package]]

name = "rust-ini"

version = "0.21.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41"

dependencies = [

 "cfg-if",

 "ordered-multimap",

 "trim-in-place",

]



[[package]]

name = "serde"

version = "1.0.200"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"

dependencies = [

 "serde_derive",

]



[[package]]

name = "serde_derive"

version = "1.0.200"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"

dependencies = [

 "proc-macro2",

 "quote",

 "syn",

]



[[package]]

name = "strsim"

version = "0.8.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"



[[package]]

name = "switch-to-configuration"

version = "0.1.0"

dependencies = [

 "anyhow",

 "dbus",

 "dbus-codegen",

 "glob",

 "log",

 "nix",

 "regex",

 "rust-ini",

 "syslog",

]



[[package]]

name = "syn"

version = "2.0.60"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"

dependencies = [

 "proc-macro2",

 "quote",

 "unicode-ident",

]



[[package]]

name = "syslog"

version = "6.1.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "dfc7e95b5b795122fafe6519e27629b5ab4232c73ebb2428f568e82b1a457ad3"

dependencies = [

 "error-chain",

 "hostname",

 "libc",

 "log",

 "time",

]



[[package]]

name = "textwrap"

version = "0.11.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"

dependencies = [

 "unicode-width",

]



[[package]]

name = "time"

version = "0.3.36"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"

dependencies = [

 "deranged",

 "itoa",

 "libc",

 "num-conv",

 "num_threads",

 "powerfmt",

 "serde",

 "time-core",

 "time-macros",

]



[[package]]

name = "time-core"

version = "0.1.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"



[[package]]

name = "time-macros"

version = "0.2.18"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"

dependencies = [

 "num-conv",

 "time-core",

]



[[package]]

name = "tiny-keccak"

version = "2.0.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"

dependencies = [

 "crunchy",

]



[[package]]

name = "trim-in-place"

version = "0.1.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc"



[[package]]

name = "unicode-ident"

version = "1.0.12"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"



[[package]]

name = "unicode-width"

version = "0.1.12"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"



[[package]]

name = "vec_map"

version = "0.8.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"



[[package]]

name = "version_check"

version = "0.9.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"



[[package]]

name = "wasi"

version = "0.11.0+wasi-snapshot-preview1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"



[[package]]

name = "winapi"

version = "0.3.9"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"

dependencies = [

 "winapi-i686-pc-windows-gnu",

 "winapi-x86_64-pc-windows-gnu",

]



[[package]]

name = "winapi-i686-pc-windows-gnu"

version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"



[[package]]

name = "winapi-x86_64-pc-windows-gnu"

version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"



[[package]]

name = "xml-rs"

version = "0.8.20"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"