X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tools.py;h=122b321d54d4886abd35bd431020c218ee66359c;hb=49a4ce9cb926041815283409433793700ff386cd;hp=bd911e8fa317ee8ad3a18f0e1ceca7561d6da8d4;hpb=daea12f08fc20740d05dcde1cd9512b8b308b54c;p=nodemanager.git

diff --git a/tools.py b/tools.py
index bd911e8..122b321 100644
--- a/tools.py
+++ b/tools.py
@@ -8,11 +8,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 +18,16 @@ def get_default_if():
     return interface
 
 def get_hwaddr_from_plnode():
-    for line in open("/usr/share/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)