[ovs-discuss] [NIC-20 10/11] xenserver: Add new helper function to interface-reconfigure.
Ben Pfaff
blp at nicira.com
Wed Aug 5 22:37:13 UTC 2009
This will be useful in the followin commit.
---
.../opt_xensource_libexec_interface-reconfigure | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
index 8f33e10..6de62b3 100755
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
@@ -543,6 +543,15 @@ def run_command(command):
return False
return True
+def read_first_line_of_file(name):
+ file = None
+ try:
+ file = open(name, 'r')
+ return file.readline().rstrip('\n')
+ finally:
+ if file != None:
+ file.close()
+
def down_netdev(interface, deconfigure=True):
if not interface_exists(interface):
log("down_netdev: interface %s does not exist, ignoring" % interface)
@@ -550,14 +559,10 @@ def down_netdev(interface, deconfigure=True):
if deconfigure:
# Kill dhclient.
pidfile_name = '/var/run/dhclient-%s.pid' % interface
- pidfile = None
try:
- pidfile = open(pidfile_name, 'r')
- os.kill(int(pidfile.readline()), signal.SIGTERM)
+ os.kill(int(read_first_line_of_file(pidfile_name)), signal.SIGTERM)
except:
pass
- if pidfile != None:
- pidfile.close()
# Remove dhclient pidfile.
try:
--
1.6.3.3
More information about the discuss
mailing list