new target: make install-bootserver

4 files changed, 6 insertions, 10 deletions

diff --git a/conf/interfaces.d_eth0 b/conf/br0.in
index 3dbf9b4..9d5c17b 100644
--- a/conf/interfaces.d_eth0
+++ b/conf/br0.in
@@ -1,9 +1,4 @@
-# iface eth0 inet static
-#   address 192.168.10.1
-#   netmask 255.255.255.0
-# # post-up ipsec restart
-
-auto br0 eth0
+auto br0
 
 iface br0 inet static
 # pre-up echo 0 > /proc/sys/net/ipv6/conf/br0/accept_ra_pinfo # disable ipv6 auto-address
@@ -11,9 +6,7 @@ iface br0 inet static
   pre-down for n in 0 1 2 3 4; do tunctl -d tap$n; done; true
   address 192.168.10.1
   netmask 255.255.255.0
-  bridge_ports eth0 tap0 tap1 tap2 tap3 tap4
+  bridge_ports tap0 tap1 tap2 tap3 tap4
   bridge_maxwait 10
-  up iptables -t nat -A POSTROUTING -o wlan0 -j MASQUERADE
+  up iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
   up sysctl -w net.ipv4.ip_forward=1
-
-iface eth0 inet manual
diff --git a/conf/dnsmasq.conf b/conf/dnsmasq.conf.in
index 5ab9008..5ab9008 100644
--- a/conf/dnsmasq.conf
+++ b/conf/dnsmasq.conf.in
diff --git a/conf/eth0 b/conf/eth0
new file mode 100644
index 0000000..364b0a2
--- /dev/null
+++ b/conf/eth0
@@ -0,0 +1,3 @@
+auto eth0
+
+iface eth0 inet dhcp
diff --git a/conf/network_if-up.d_samizdat b/conf/network_if-up.d_samizdat.in
index 4c02c93..4c02c93 100755
--- a/conf/network_if-up.d_samizdat
+++ b/conf/network_if-up.d_samizdat.in