talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #242191 from tie/systemd-required-for-online-range

Browse Source
This commit is contained in:
Ryan Lahfa
2023-09-30 01:16:21 +02:00
committed by GitHub
parent 7eddaf49b8 bc644aee70
commit 3c3ef90189
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
nixos/modules/system/boot/networkd.nix
View File

@@ -517,17 +517,24 @@ let
(assertValueOneOf "Unmanaged" boolValues) (assertValueOneOf "Unmanaged" boolValues)
(assertInt "Group") (assertInt "Group")
(assertRange "Group" 0 2147483647) (assertRange "Group" 0 2147483647)
(assertValueOneOf "RequiredForOnline" (boolValues ++ [ (assertValueOneOf "RequiredForOnline" (boolValues ++ (
"missing" let
"off" # https://freedesktop.org/software/systemd/man/networkctl.html#missing
"no-carrier" operationalStates = [
"dormant" "missing"
"degraded-carrier" "off"
"carrier" "no-carrier"
"degraded" "dormant"
"enslaved" "degraded-carrier"
"routable" "carrier"
])) "degraded"
"enslaved"
"routable"
];
operationalStateRanges = concatLists (imap0 (i: min: map (max: "${min}:${max}") (drop i operationalStates)) operationalStates);
in
operationalStates ++ operationalStateRanges
)))
(assertValueOneOf "RequiredFamilyForOnline" [ (assertValueOneOf "RequiredFamilyForOnline" [
"ipv4" "ipv4"
"ipv6" "ipv6"