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

diff --git a/tools.py b/tools.py
index bd911e8..941838b 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,17 +18,18 @@ def get_default_if():
     return interface
 
 def get_hwaddr_from_plnode():
-    for line in open("/usr/share/boot/plnode.txt", 'r').readlines():
+    for line in open("/usr/boot/plnode.txt", 'r').readlines():
         if line.startswith("NET_DEVICE"):
             return line.split("=")[1].strip().strip('"')
     return None
 
 def get_if_from_hwaddr(hwaddr):
-    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."""