Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core into spring-merge

rpm_spec/core-netvm.spec

@@ -79,6 +79,9 @@ fi
 chkconfig --add qubes_core_netvm || echo "WARNING: Cannot add service qubes_core!"
 chkconfig qubes_core_netvm on || echo "WARNING: Cannot enable service qubes_core!"
 
+# Remove ip_forward setting from sysctl, so NM will not reset it
+sed 's/^net.ipv4.ip_forward.*/#\0/'  -i /etc/sysctl.conf
+
 %preun
 if [ "$1" = 0 ] ; then
     # no more packages left