diff options
Diffstat (limited to 'nixpkgs/nixos/modules/system/boot/stage-2.nix')
-rw-r--r-- | nixpkgs/nixos/modules/system/boot/stage-2.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/nixpkgs/nixos/modules/system/boot/stage-2.nix b/nixpkgs/nixos/modules/system/boot/stage-2.nix index fa2bf938df4f..6b4193ea2967 100644 --- a/nixpkgs/nixos/modules/system/boot/stage-2.nix +++ b/nixpkgs/nixos/modules/system/boot/stage-2.nix @@ -19,11 +19,6 @@ let pkgs.coreutils pkgs.util-linux ] ++ lib.optional useHostResolvConf pkgs.openresolv); - fsPackagesPath = lib.makeBinPath config.system.fsPackages; - systemdUnitPathEnvVar = lib.optionalString (config.boot.extraSystemdUnitPaths != []) - ("SYSTEMD_UNIT_PATH=" - + builtins.concatStringsSep ":" config.boot.extraSystemdUnitPaths - + ":"); # If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable postBootCommands = pkgs.writeText "local-cmds" '' ${config.boot.postBootCommands} @@ -42,25 +37,23 @@ in default = ""; example = "rm -f /var/log/messages"; type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands to be executed just before systemd is started. ''; }; systemdExecutable = mkOption { - default = "systemd"; + default = "/run/current-system/systemd/lib/systemd/systemd"; type = types.str; - description = '' - The program to execute to start systemd. Typically - <literal>systemd</literal>, which will find systemd in the - PATH. + description = lib.mdDoc '' + The program to execute to start systemd. ''; }; extraSystemdUnitPaths = mkOption { default = []; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Additional paths that get appended to the SYSTEMD_UNIT_PATH environment variable that can contain mutable unit files. ''; |