Merge branch 'master' into fetlab

2018-10-27 00:39:23 +02:00
parent 7eea5660f9 3a83f9b406
commit c32b0cfbd4
21 changed files with 3180 additions and 63 deletions
--- a/templates/interfaces_ariane.j2
+++ b/templates/interfaces_ariane.j2
@@ -9,11 +9,9 @@ allow-hotplug enp8s0
 iface enp8s0 inet dhcp

 auto br0
-iface br0 inet dhcp
+iface br0 inet manual
    bridge_ports enp9s0
    bridge_fd 0
    bridge_maxwait 0

 dns-nameservers 192.168.86.1
-#dns-nameservers 192.168.86.1 10.0.3.1
-#dns-nameserver 10.0.3.1