Merge master into staging-next

2021-04-08 18:14:17 +00:00
parent bf6abedefb c6bd90d48f
commit 85b57e4446
96 changed files with 5973 additions and 343 deletions
@@ -55,7 +55,7 @@ in
    # The shared libraries are required for DNS resolution
    boot.initrd.extraUtilsCommands = ''
      copy_bin_and_libs ${pkgs.openvpn}/bin/openvpn
-      copy_bin_and_libs ${pkgs.iproute}/bin/ip
+      copy_bin_and_libs ${pkgs.iproute2}/bin/ip

      cp -pv ${pkgs.glibc}/lib/libresolv.so.2 $out/lib
      cp -pv ${pkgs.glibc}/lib/libnss_dns.so.2 $out/lib