From c95fd449b7654d12adbb722f8f91183c651cfbc5 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 11 Jun 2010 18:34:59 +0200 Subject: [PATCH] Do not start NetworkManager from dom0 qubes_netvm script Mark it for auto-start instead by the system scripts --- dom0/init.d/qubes_netvm | 1 - rpm_spec/core-dom0.spec | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dom0/init.d/qubes_netvm b/dom0/init.d/qubes_netvm index 4fe1ab4a..a95e806a 100755 --- a/dom0/init.d/qubes_netvm +++ b/dom0/init.d/qubes_netvm @@ -30,7 +30,6 @@ start() elif [ $NETVM = "dom0" ] ; then echo -n $"Setting up net backend in Dom0:" - /etc/init.d/NetworkManager start brctl addbr br0 || exit 1 ifconfig br0 10.0.0.1 netmask 255.255.0.0 up || exit 1 ifconfig br0:1 10.0.255.254 netmask 255.255.0.0 up || exit 1 diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec index cf48c3da..d21b715c 100644 --- a/rpm_spec/core-dom0.spec +++ b/rpm_spec/core-dom0.spec @@ -97,6 +97,7 @@ cp init.d/iptables $RPM_BUILD_ROOT/etc/sysconfig %post chkconfig iptables on +chkconfig NetworkManager on sed 's/^net.ipv4.ip_forward.*/net.ipv4.ip_forward = 1/' -i /etc/sysctl.conf if [ "$1" != 1 ] ; then