Unverified Commit 90d69b16 authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

Merge pull request #236388 from ElvishJerricco/sd-s1-networkd-stop-on-switch-root 

systemd stage 1 networking: Stop systemd-networkd on switch-root
parents 65ad3488 5d6ea734

nixos/modules/system/boot/networkd.nix

+13 −1
Original line number Diff line number Diff line
@@ -3188,7 +3188,19 @@ let 


      systemd.contents."/etc/systemd/networkd.conf" = renderConfig cfg.config;



      systemd.services.systemd-networkd.wantedBy = [ "initrd.target" ];

      systemd.services.systemd-networkd = {

        wantedBy = [ "initrd.target" ];

        # These before and conflicts lines can be removed when this PR makes it into a release:

        # https://github.com/systemd/systemd/pull/27791

        before = ["initrd-switch-root.target"];

        conflicts = ["initrd-switch-root.target"];

      };

      systemd.sockets.systemd-networkd = {

        wantedBy = [ "initrd.target" ];

        before = ["initrd-switch-root.target"];

        conflicts = ["initrd-switch-root.target"];

      };



      systemd.services.systemd-network-generator.wantedBy = [ "sysinit.target" ];



      systemd.storePaths = [

nixos/tests/systemd-initrd-networkd.nix

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 
      systemd.services.check-flush = {

        requiredBy = ["multi-user.target"];

        before = ["network-pre.target" "multi-user.target"];

        wants = ["network-pre.target"];

        unitConfig.DefaultDependencies = false;

        serviceConfig.Type = "oneshot";

        path = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ];