diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:30:16 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:30:16 +0200 |
| commit | c68f58d95c0e34d91ff3e4f08464954fd0e9e466 (patch) | |
| tree | 11455dc939663bdda36790451315de1cc364614b /nixos/modules/system | |
| parent | 8d56f2472e47a3f1f388b69c0ecc24421910d555 (diff) | |
| parent | a2bd8da766c7a7ea456afd099b86920dd902cec4 (diff) | |
| download | nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.tar nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.tar.gz nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.tar.bz2 nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.tar.lz nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.tar.xz nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.tar.zst nixlib-c68f58d95c0e34d91ff3e4f08464954fd0e9e466.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system')
3 files changed, 5 insertions, 6 deletions
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 5c88d27b6c65..f67d29005616 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -46,8 +46,8 @@ let ln -s ${kernelPath} $out/kernel ln -s ${config.system.modulesTree} $out/kernel-modules - ${optionalString (pkgs.stdenv.hostPlatform.platform.kernelDTB or false) '' - ln -s ${config.boot.kernelPackages.kernel}/dtbs $out/dtbs + ${optionalString (config.hardware.deviceTree.package != null) '' + ln -s ${config.hardware.deviceTree.package} $out/dtbs ''} echo -n "$kernelParams" > $out/kernel-params diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh index c780a89b102c..0092ee92b62f 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -75,9 +75,8 @@ addEntry() { copyToKernelsDir "$path/kernel"; kernel=$result copyToKernelsDir "$path/initrd"; initrd=$result - # XXX UGLY: maybe the system config should have a top-level "dtbs" entry? - dtbDir=$(readlink -m "$path/kernel/../dtbs") - if [ -d "$dtbDir" ]; then + dtbDir=$(readlink -m "$path/dtbs") + if [ -e "$dtbDir" ]; then copyToKernelsDir "$dtbDir"; dtbs=$result fi diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index f1aa9064bef4..d6b446e9ac22 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -10,7 +10,7 @@ let checkLink = checkUnitConfig "Link" [ (assertOnlyFields [ - "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name" + "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "OriginalName" "MTUBytes" "BitsPerSecond" "Duplex" "AutoNegotiation" "WakeOnLan" "Port" "TCPSegmentationOffload" "TCP6SegmentationOffload" "GenericSegmentationOffload" "GenericReceiveOffload" "LargeReceiveOffload" "RxChannels" "TxChannels" |