From b558b3652bf3f64fba0bcd49084d60c961f2873e Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Tue, 13 Jul 2021 10:01:04 +0000
Subject: [PATCH] Only add Wireguard kernel module on Kernels that do not
already have it
This makes wireguard work on older kernels (19.09 nixos), i.e.
our storage servers currently) and newer kernels (21.05, i.e.
the monitoring server).
---
morph/lib/vagrant-guest.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/morph/lib/vagrant-guest.nix b/morph/lib/vagrant-guest.nix
index 9e8e6d8c..360671f5 100644
--- a/morph/lib/vagrant-guest.nix
+++ b/morph/lib/vagrant-guest.nix
@@ -1,6 +1,6 @@
# Minimal configuration that vagrant depends on
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
let
# Vagrant uses an insecure shared private key by default, but we
# don't use the authorizedKeys attribute under users because it should be
@@ -22,8 +22,10 @@ in
# Enable the OpenSSH daemon.
services.openssh.enable = true;
- # Wireguard kernel module
- boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
+ # Wireguard kernel module for Kernels < 5.6
+ boot = lib.mkIf (lib.versionOlder pkgs.linuxPackages.kernel.version "5.6") {
+ extraModulePackages = [ config.boot.kernelPackages.wireguard ] ;
+ };
# Enable DBus
services.dbus.enable = true;
--
GitLab