public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-05-02 09:39:00 +02:00
parent 00bbfccecf 309711c4b4
commit afb1041148
148 changed files with 4999 additions and 2597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/virtualisation/nixos-containers.nix
+1 -1
View File
@@ -546,7 +546,7 @@ in
Note that this option might require to do some adjustments to the container configuration,
e.g. you might want to set
<varname>systemd.network.networks.$interface.dhcpConfig.ClientIdentifier</varname> to "mac"
<varname>systemd.network.networks.$interface.dhcpV4Config.ClientIdentifier</varname> to "mac"
if you use <varname>macvlans</varname> option.
This way dhcp client identifier will be stable between the container restarts.