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
Setting tag NodeManager-1.8-17
[nodemanager.git]
/
tools.py
diff --git
a/tools.py
b/tools.py
index
f3e67e1
..
941838b
100644
(file)
--- a/
tools.py
+++ b/
tools.py
@@
-9,10
+9,6
@@
import threading
import fcntl
import commands
import logger
import fcntl
import commands
import logger
-try:
- import sioc
-except:
- pass
PID_FILE = '/var/run/nm.pid'
PID_FILE = '/var/run/nm.pid'
@@
-28,11
+24,12
@@
def get_hwaddr_from_plnode():
return None
def get_if_from_hwaddr(hwaddr):
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."""