3 files changed, 26 insertions, 16 deletions

diff --git a/conf/dnsmasq.conf b/conf/dnsmasq.conf
index 2b523ec..7200efc 100644
--- a/conf/dnsmasq.conf
+++ b/conf/dnsmasq.conf
@@ -1,9 +1,17 @@
 interface=br0
 domain=localdomain
 dhcp-range=192.168.10.10,192.168.10.253,255.255.255.0,1h
-dhcp-boot=pxelinux.0,pxeserver,192.168.10.1
-pxe-service=x86PC, "Samizdat", pxelinux
 enable-tftp
+
+dhcp-host=52:54:00:12:34:56,samizdoot-vm,192.168.10.82
+#dhcp-host=f0:de:f1:5a:ac:e8,samizdoot-irl,192.168.10.82
+
+pxe-service=x86PC, "Samizdat", pxelinux
+dhcp-boot=pxelinux.0
 tftp-root=/usr/local/lib/samizdat-rhizome/isolinux
+
+# dhcp-boot=/boot/grub/i386-pc/core.0
+# tftp-root=/srv/tftp
+
 tftp-unique-root
 dhcp-script=/usr/local/bin/dnsmasq-dhcp-script.sh
diff --git a/conf/interfaces.d_eth0 b/conf/interfaces.d_eth0
index 5ec8666..3dbf9b4 100644
--- a/conf/interfaces.d_eth0
+++ b/conf/interfaces.d_eth0
@@ -6,23 +6,14 @@
 auto br0 eth0
 
 iface br0 inet static
+# pre-up echo 0 > /proc/sys/net/ipv6/conf/br0/accept_ra_pinfo # disable ipv6 auto-address
+  pre-up   for n in 0 1 2 3 4; do tunctl -t tap$n; done; true
+  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
-## These are useful for VMs:
-# pre-up   for n in 0 1 2 3 4; do tunctl -t tap$n; done; true
-# pre-down for n in 0 1 2 3 4; do tunctl -d tap$n; done; true
-# bridge_ports eth0 tap0 tap1 tap2 tap3 tap4
-# bridge_maxwait 10
-
-## Enable "internet connection sharing"
+  bridge_ports eth0 tap0 tap1 tap2 tap3 tap4
+  bridge_maxwait 10
   up iptables -t nat -A POSTROUTING -o wlan0 -j MASQUERADE
   up sysctl -w net.ipv4.ip_forward=1
 
-## Disable ipv6 auto-address.
-## This is needed sometimes, if ipv6 breaks ipv4.
-# pre-up echo 0 > /proc/sys/net/ipv6/conf/br0/accept_ra_pinfo
-
-# NB. 'ipsec reload' does not work very well
-  post-up ipsec restart
-
 iface eth0 inet manual
diff --git a/conf/nbd-server b/conf/nbd-server
new file mode 100644
index 0000000..a106b7d
--- /dev/null
+++ b/conf/nbd-server
@@ -0,0 +1,11 @@
+[generic]
+# If you want to run everything as root rather than the nbd user, you
+# may either say "root" in the two following lines, or remove them
+# altogether. Do not remove the [generic] section, however.
+        user = nbd
+        group = nbd
+        includedir = /etc/nbd-server/conf.d
+        allowlist = true
+
+# What follows are export definitions. You may create as much of them as
+# you want, but the section header has to be unique.