diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-02 00:02:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-02 00:02:27 +0000 |
| commit | d4d107cf3db12beb0b9463d1e12a91748975fbaf (patch) | |
| tree | ebb83b1ab33bb8c01fa608bcbc804fc88bdf5105 /nixos | |
| parent | 94fea1c5b595e98cd297858e1d6dbacbe896a05c (diff) | |
| parent | 2c732a9b5a5a60d91c685c92b87db5b8f5cf5812 (diff) | |
| download | nixpkgs-d4d107cf3db12beb0b9463d1e12a91748975fbaf.tar nixpkgs-d4d107cf3db12beb0b9463d1e12a91748975fbaf.tar.gz nixpkgs-d4d107cf3db12beb0b9463d1e12a91748975fbaf.tar.bz2 nixpkgs-d4d107cf3db12beb0b9463d1e12a91748975fbaf.tar.lz nixpkgs-d4d107cf3db12beb0b9463d1e12a91748975fbaf.tar.xz nixpkgs-d4d107cf3db12beb0b9463d1e12a91748975fbaf.tar.zst nixpkgs-d4d107cf3db12beb0b9463d1e12a91748975fbaf.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/predictable-interface-names.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index 42183625c7c..51d5e8ae59b 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -36,7 +36,7 @@ in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd, systemdStage networking.useDHCP = !withNetworkd; # Check if predictable interface names are working in stage-1 - boot.initrd.postDeviceCommands = script; + boot.initrd.postDeviceCommands = lib.mkIf (!systemdStage1) script; boot.initrd.systemd = lib.mkIf systemdStage1 { enable = true; |