From 70bbc7923d36b130ad644e916b58e29e8b86ccbf Mon Sep 17 00:00:00 2001
From: HW42 <hw42@ipsumj.de>
Date: Fri, 26 Sep 2014 18:55:42 +0200
Subject: [PATCH] install iptables/forwarding for debian

---
 Makefile              | 4 ++++
 debian/control        | 2 +-
 network/80-qubes.conf | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 network/80-qubes.conf

diff --git a/Makefile b/Makefile
index 2ef4c76..d2087a3 100644
--- a/Makefile
+++ b/Makefile
@@ -182,5 +182,9 @@ install-deb:
 	mkdir -p $(DESTDIR)/etc/apt/sources.list.d
 	sed -e "s/@DIST@/`cat /etc/debian_version | cut -d/ -f 1`/" misc/qubes-r2.list.in > $(DESTDIR)/etc/apt/sources.list.d/qubes-r2.list
 	install -D -m 644 misc/qubes-archive-keyring.gpg $(DESTDIR)/etc/apt/trusted.gpg.d/qubes-archive-keyring.gpg
+	install -D -m 644 network/iptables $(DESTDIR)/etc/iptables/rules.v4
+	install -D -m 644 network/ip6tables $(DESTDIR)/etc/iptables/rules.v6
+	install -d $(DESTDIR)/etc/sysctl.d
+	install -m 644 network/80-qubes.conf $(DESTDIR)/etc/sysctl.d/
 
 install-vm: install-rh install-common
diff --git a/debian/control b/debian/control
index 62967a7..670ecea 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Git: git://git.qubes-os.org/marmarek/core-agent-linux.git
 
 Package: qubes-core-agent
 Architecture: any
-Depends: qubes-utils, libvchan-xen, xenstore-utils, ethtool, python2.7, ${shlibs:Depends}, ${misc:Depends}
+Depends: qubes-utils, libvchan-xen, xenstore-utils, ethtool, python2.7, iptables-persistent, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: qubes-core-agent-linux
 Description: Qubes core agent
  This package includes various daemons necessary for qubes domU support,
diff --git a/network/80-qubes.conf b/network/80-qubes.conf
new file mode 100644
index 0000000..119d730
--- /dev/null
+++ b/network/80-qubes.conf
@@ -0,0 +1 @@
+net.ipv4.ip_forward=1