Do not invoke kill dnsmasq if no pid file was found.

fixes Bug 943690 Change-Id: I2b1f5cc66ba6ef02219c0d4445487bdd3a541f4b
openstack · Mar 2, 2012 · dab9de9 · dab9de9
1 parent 31b0e17
commit dab9de9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Authors b/Authors
@@ -76,6 +76,7 @@ James E. Blair <jeblair@hp.com>
 Jason Cannavale <jason.cannavale@rackspace.com>
 Jason Koelker <jason@koelker.net>
 Jay Pipes <jaypipes@gmail.com>
+JC Martin <jcmartin@ebaysf.com>
 Jesse Andrews <anotherjesse@gmail.com>
 Jimmy Bergman <jimmy@sigint.se>
 Joe Gordon <jogo@cloudscaling.com>

diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
@@ -682,7 +682,8 @@ def update_dhcp_hostfile_with_text(dev, hosts_text):
 
 def kill_dhcp(dev):
     pid = _dnsmasq_pid_for(dev)
-    _execute('kill', '-9', pid, run_as_root=True)
+    if pid:
+        _execute('kill', '-9', pid, run_as_root=True)
 
 
 # NOTE(ja): Sending a HUP only reloads the hostfile, so any