diff options
author | Fredrik Thulin <fredrik@thulin.net> | 2014-05-26 11:47:59 +0200 |
---|---|---|
committer | Fredrik Thulin <fredrik@thulin.net> | 2014-05-26 11:47:59 +0200 |
commit | 9b27b9f2542d8e065e194736d008aa2cdb1c4cfc (patch) | |
tree | ee39ef5a52b0e6b24cc5bf4de82df06d0ab38231 /sto-tug-kvm1.swamid.se | |
parent | 15476295654c13802503ba10110663580a80de76 (diff) | |
parent | 266039ca73ee423630610ccbd16046bd52545379 (diff) |
Merge remote-tracking branch 'remotes/origin/master'sunet-ops-2014-05-26-v01
Diffstat (limited to 'sto-tug-kvm1.swamid.se')
-rw-r--r-- | sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces b/sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces index 5eca717..4490f48 100644 --- a/sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces +++ b/sto-tug-kvm1.swamid.se/overlay/etc/network/interfaces @@ -5,20 +5,27 @@ auto lo iface lo inet loopback -# The primary network interface auto eth0 -iface eth0 inet static - address 130.242.125.5 +iface eth0 inet manual + +# The primary network interface +auto br0 +iface br0 inet static + address 130.242.125.71 netmask 255.255.255.192 - network 130.242.125.0 - broadcast 130.242.125.63 - gateway 130.242.125.1 + network 130.242.125.64 + broadcast 130.242.125.127 + gateway 130.242.125.65 # dns-* options are implemented by the resolvconf package, if installed dns-nameservers 130.242.80.14 130.242.80.99 dns-search swamid.se + bridge_ports eth0 + bridge_fd 9 + bridge_hello 2 + bridge_maxage 12 -iface eth0 inet6 static - address 2001:6b0:8:3::5 - netmask 64 - gateway 2001:6b0:8:3::1 +#iface eth0 inet6 static +# address 2001:6b0:8:3::5 +# netmask 64 +# gateway 2001:6b0:8:3::1 |