[openstack-nova/f16] Avoid killing dnsmasq on network service shutdown (#805947)

[Mark McLoughlin]

commit 7b478740c82fd9617d41bdf285980893cfdea1a7
Author: Mark McLoughlin <markmc at redhat.com>
Date:   Mon Mar 26 08:47:37 2012 +0100

    Avoid killing dnsmasq on network service shutdown (#805947)

 openstack-nova-network.service |    3 +++
 openstack-nova.spec            |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/openstack-nova-network.service b/openstack-nova-network.service
index 29c5ef1..00b99bb 100644
--- a/openstack-nova-network.service
+++ b/openstack-nova-network.service
@@ -7,6 +7,9 @@ Type=simple
 User=nova
 ExecStart=/usr/bin/nova-network --flagfile /etc/nova/nova.conf --logfile /var/log/nova/network.log
 
+# Don't kill dnsmasq on shutdown (#805947)
+KillMode=process
+
 [Install]
 WantedBy=multi-user.target
 
diff --git a/openstack-nova.spec b/openstack-nova.spec
index c15611c..290ddc8 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2011.3.1
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -370,6 +370,9 @@ fi
 %endif
 
 %changelog
+* Mon Mar 26 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-6
+- Avoid killing dnsmasq on network service shutdown (#805947)
+
 * Mon Mar  6 2012 Pádraig Brady <P at draigBrady.com> - 2011.3.1-5
 - Require bridge-utils