X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tools.py;h=94ba2d12eb2cca27d3df74dd2a5887706f05e6d7;hb=3224c1906c82596a86ae734181488ed14a0f0976;hp=60838c7e6e3bdae47aeff05a13bbeb5d31534af2;hpb=5a58b01aab2f3d907db671f95307c05e410d21a3;p=nodemanager.git

diff --git a/tools.py b/tools.py
index 60838c7..94ba2d1 100644
--- a/tools.py
+++ b/tools.py
@@ -1,3 +1,6 @@
+# $Id$
+# $URL$
+
 """A few things that didn't seem to fit anywhere else."""
 
 import cPickle
@@ -8,11 +11,8 @@ import tempfile
 import threading
 import fcntl
 import commands
-import sioc
-
 import logger
 
-
 PID_FILE = '/var/run/nm.pid'
 
 def get_default_if():
@@ -21,12 +21,16 @@ def get_default_if():
     return interface
 
 def get_hwaddr_from_plnode():
-    for line in open("/usr/boot/plnode.txt", 'r').readlines():
-        if line.startswith("NET_DEVICE"):
-            return line.split("=")[1].strip().strip('"')
+    try:
+        for line in open("/usr/boot/plnode.txt", 'r').readlines():
+            if line.startswith("NET_DEVICE"):
+                return line.split("=")[1].strip().strip('"')
+    except:
+        pass
     return None
 
 def get_if_from_hwaddr(hwaddr):
+    import sioc
     devs = sioc.gifconf()
     for dev in devs:
         dev_hwaddr = sioc.gifhwaddr(dev)