Unverified Commit a5265503 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

Merge pull request #327506 from ElvishJerricco/systemd-initrd-merge-sbin 

systemd-stage-1: Use common bin for /sbin
parents 5bd926fa b4b4751e

nixos/modules/system/boot/systemd/initrd.nix

+5 −5
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ let 
  initrdBinEnv = pkgs.buildEnv {

    name = "initrd-bin-env";

    paths = map getBin cfg.initrdBin;

    pathsToLink = ["/bin" "/sbin"];

    pathsToLink = ["/bin"];

    postBuild = concatStringsSep "\n" (mapAttrsToList (n: v: "ln -sf '${v}' $out/bin/'${n}'") cfg.extraBin);

  };
@@ -408,7 +408,7 @@ in { 
        fsck = "${cfg.package.util-linux}/bin/fsck";

      };



      managerEnvironment.PATH = "/bin:/sbin";

      managerEnvironment.PATH = "/bin";



      contents = {

        "/tmp/.keep".text = "systemd requires the /tmp mount point in the initrd cpio archive";
@@ -417,7 +417,7 @@ in { 


        "/etc/systemd/system.conf".text = ''

          [Manager]

          DefaultEnvironment=PATH=/bin:/sbin

          DefaultEnvironment=PATH=/bin

          ${cfg.extraConfig}

          ManagerEnvironment=${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment)}

        '';
@@ -432,9 +432,9 @@ in { 
        "/etc/shadow".text = "root:${if isBool cfg.emergencyAccess then optionalString (!cfg.emergencyAccess) "*" else cfg.emergencyAccess}:::::::";



        "/bin".source = "${initrdBinEnv}/bin";

        "/sbin".source = "${initrdBinEnv}/sbin";

        "/sbin".source = "${initrdBinEnv}/bin";



        "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe";

        "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /bin/modprobe";

        "/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf";

        "/etc/modprobe.d/ubuntu.conf".source = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { } ''

          ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out