X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tools.py;h=122b321d54d4886abd35bd431020c218ee66359c;hb=f9bb3327f1a77a058d98c15095a8c4e874564c9b;hp=f3e67e1595a185c907799d93f1f851526b084282;hpb=4293a16c3c0badbc130c3af6b62c3681a5eeb9d6;p=nodemanager.git

diff --git a/tools.py b/tools.py
index f3e67e1..122b321 100644
--- a/tools.py
+++ b/tools.py
@@ -9,10 +9,6 @@ import threading
 import fcntl
 import commands
 import logger
-try:
-   import sioc
-except:
-   pass
 
 PID_FILE = '/var/run/nm.pid'
 
@@ -22,12 +18,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)