1 files changed, 32 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index b64cab9..e5a3109 100644
--- a/Makefile
+++ b/Makefile
@@ -40,12 +40,42 @@ install-nested-kvm: conf/kvm.conf
         install -m0644 conf/kvm.conf ${instdir}/etc/modprobe.d/
         modprobe -r kvm-intel kvm-amd kvm; modprobe kvm; modprobe kvm-intel; modprobe kvm-amd; true
 
-install-configuration:
+network_filter := $(shell ./src/generate-network-filter.sh)
+
+conf_files_out = conf/br0 conf/dnsmasq.conf conf/network_if-up.d_samizdat
+conf_files_in = $(addsuffix .in, $(conf_files_out))
+
+$(conf_files_out): $(conf_files_in) ./src/generate-network-filter.sh
+        sed -e '$(network_filter)' < $@.in > $@
+
+static_conf_files = conf/torrc conf/nbd-server conf/postfix_main.cf
+
+.PHONY: install-configuration install-bootserver start-bootserver
+install-bootserver:
+        sudo -E $(MAKE) instdir=/ real-install-bootserver start-bootserver
+
+start-bootserver:
+        ifup --force br0
+        service dnsmasq restart
+        service nbd-server restart
+
+real-install-bootserver: $(conf_files_out) $(static_conf_files)
+ifndef instdir
+        $(error "You must specify instdir, for safety.")
+else
+        install  -p  -m0644  -DT  conf/dnsmasq.conf              ${instdir}/etc/dnsmasq.conf
+        install  -p  -m0644  -DT  conf/eth0                      ${instdir}/etc/network/interfaces.d/eth0
+        install  -p  -m0644  -DT  conf/br0                       ${instdir}/etc/network/interfaces.d/br0
+        install  -p  -m0644  -DT  conf/network_if-up.d_samizdat  ${instdir}/etc/network/if-up.d/samizdat
+endif
+
+install-configuration: real-install-bootserver $(conf_files_out) $(static_conf_files)
 ifndef instdir
         $(error "You must specify instdir, for safety.")
 else
         install  -p  -m0644  -DT  conf/dnsmasq.conf              ${instdir}/etc/dnsmasq.conf
-        install  -p  -m0644  -DT  conf/interfaces.d_eth0         ${instdir}/etc/network/interfaces.d/eth0
+        install  -p  -m0644  -DT  conf/eth0                      ${instdir}/etc/network/interfaces.d/eth0
+        install  -p  -m0644  -DT  conf/br0                       ${instdir}/etc/network/interfaces.d/br0
         install  -p  -m0644  -DT  conf/network_if-up.d_samizdat  ${instdir}/etc/network/if-up.d/samizdat
         install  -p  -m0644  -DT  conf/postfix_main.cf           ${instdir}/etc/postfix/main.cf
         install  -p  -m0644  -DT  conf/torrc                     ${instdir}/etc/tor/torrc