Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2ed8568d837a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 131ff6dd9c8d
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 6, 2019

  1. nixos/networkd: add Name as valid option to Link 

    This has been there since v209 [1]

```
The interface name to use. This option has lower precedence than NamePolicy=, so for this setting to take effect, NamePolicy= must either be unset, empty, disabled, or all policies configured there must fail. Also see the example below with "Name=dmz0".

Note that specifying a name that the kernel might use for another interface (for example "eth0") is dangerous because the name assignment done by udev will race with the assignment done by the kernel, and only one interface may use the name. Depending on the order of operations, either udev or the kernel will win, making the naming unpredictable. It is best to use some different prefix, for example "internal0"/"external0" or "lan0"/"lan1"/"lan3".
```

[1] systemd/systemd@43b3a5e

(cherry picked from commit 943508a)
    @fooker @Ma27
    fooker authored and Ma27 committed Dec 6, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    76049ce View commit details

  2. nixos/networkd: add missing "Advertise" option 

    This is in systemd since v240.

(cherry picked from commit 2c1281e)
    @flokli @Ma27
    flokli authored and Ma27 committed Dec 6, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0e4d0ad View commit details

  3. nixos/networkd: Add more valid values for RequiredForOnline 

    `RequiredForOnline` allows for a boolean value or operational state.
This adds the values for all valid the operational states.

(cherry picked from commit 0aeaf4d)
    @fooker @Ma27
    fooker authored and Ma27 committed Dec 6, 2019
    Copy the full SHA
    131ff6d View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 nixos/modules/system/boot/networkd.nix
6 changes: 3 additions & 3 deletions nixos/modules/system/boot/networkd.nix
View file
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ let

checkLink = checkUnitConfig "Link" [
(assertOnlyFields [
"Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "OriginalName"
"MTUBytes" "BitsPerSecond" "Duplex" "AutoNegotiation" "WakeOnLan" "Port"
"Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name" "OriginalName"
"MTUBytes" "BitsPerSecond" "Duplex" "AutoNegotiation" "WakeOnLan" "Port" "Advertise"
"TCPSegmentationOffload" "TCP6SegmentationOffload" "GenericSegmentationOffload"
"GenericReceiveOffload" "LargeReceiveOffload" "RxChannels" "TxChannels"
"OtherChannels" "CombinedChannels"
@@ -276,7 +276,7 @@ let
(assertValueOneOf "ARP" boolValues)
(assertValueOneOf "Multicast" boolValues)
(assertValueOneOf "Unmanaged" boolValues)
(assertValueOneOf "RequiredForOnline" boolValues)
(assertValueOneOf "RequiredForOnline" (boolValues ++ ["off" "no-carrier" "dormant" "degraded-carrier" "carrier" "degraded" "enslaved" "routable"]))
];