diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-18 18:01:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-18 18:01:41 +0000 |
| commit | dc7ebb016390d3e8debba854bf93d17a55d63c30 (patch) | |
| tree | 9803897c0292ea5ab80e48e368aebebe0c714f2b /nixos/tests/common | |
| parent | 0f6cf57d0af4f2e37d636801895696fabcbbad3e (diff) | |
| parent | 5400210d8401123de23b92c6931301bb956829b0 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'nixos/tests/common')
| -rw-r--r-- | nixos/tests/common/ec2.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/common/ec2.nix b/nixos/tests/common/ec2.nix index 64b0a91ac1f72..6ed420e0aae75 100644 --- a/nixos/tests/common/ec2.nix +++ b/nixos/tests/common/ec2.nix @@ -46,7 +46,7 @@ with pkgs.lib; # Note: we use net=169.0.0.0/8 rather than # net=169.254.0.0/16 to prevent dhcpcd from getting horribly # confused. (It would get a DHCP lease in the 169.254.* - # range, which it would then configure and prompty delete + # range, which it would then configure and promptly delete # again when it deletes link-local addresses.) Ideally we'd # turn off the DHCP server, but qemu does not have an option # to do that. |