git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import sioc only when needed.
[nodemanager.git]
/
tools.py
diff --git
a/tools.py
b/tools.py
index
bd911e8
..
941838b
100644
(file)
--- a/
tools.py
+++ b/
tools.py
@@
-8,11
+8,8
@@
import tempfile
import threading
import fcntl
import commands
import threading
import fcntl
import commands
-import sioc
-
import logger
import logger
-
PID_FILE = '/var/run/nm.pid'
def get_default_if():
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():
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):
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."""
def as_daemon_thread(run):
"""Call function <run> with no arguments in its own thread."""