X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tools.py;h=122b321d54d4886abd35bd431020c218ee66359c;hb=58f46637398bc93da425c7bde56159bc066e1e2b;hp=941838bd41529c5a69cded3d3edd309beb2ab670;hpb=310731475dd01a807c72a92e8549e965f918698a;p=nodemanager.git

diff --git a/tools.py b/tools.py
index 941838b..122b321 100644
--- a/tools.py
+++ b/tools.py
@@ -18,18 +18,21 @@ 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)
-      if dev_hwaddr == hwaddr: return dev
-   return None
+    import sioc
+    devs = sioc.gifconf()
+    for dev in devs:
+        dev_hwaddr = sioc.gifhwaddr(dev)
+        if dev_hwaddr == hwaddr: return dev
+    return None
 
 def as_daemon_thread(run):
     """Call function <run> with no arguments in its own thread."""