Unverified Commit 688fa413 authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

Merge pull request #201396 from ElvishJerricco/systemd-util-linux-path-stage-1-fix

nixos: Fix systemd stage 1 after #201266
parents 216e161b b28ecff1
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -558,7 +558,8 @@ in
      # Environment of PID 1
      systemd.managerEnvironment = {
        # Doesn't contain systemd itself - everything works so it seems to use the compiled-in value for its tools
        PATH = lib.makeBinPath config.system.fsPackages;
        # util-linux is needed for the main fsck utility wrapping the fs-specific ones
        PATH = lib.makeBinPath (config.system.fsPackages ++ [cfg.package.util-linux]);
        LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
        TZDIR = "/etc/zoneinfo";
        # If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable
+1 −5
Original line number Diff line number Diff line
@@ -300,11 +300,7 @@ in
    boot.supportedFilesystems = map (fs: fs.fsType) fileSystems;

    # Add the mount helpers to the system path so that `mount' can find them.
    system.fsPackages = [
      pkgs.dosfstools
      # This is needed for the main fsck utility wrapping the fs-specific ones.
      pkgs.util-linux
    ];
    system.fsPackages = [ pkgs.dosfstools ];

    environment.systemPackages = with pkgs; [ fuse3 fuse ] ++ config.system.fsPackages;