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
testing: this is to avoid building failing while building myplc-doc
[nodemanager.git]
/
tools.py
diff --git
a/tools.py
b/tools.py
index
bd911e8
..
f3e67e1
100644
(file)
--- a/
tools.py
+++ b/
tools.py
@@
-8,10
+8,11
@@
import tempfile
import threading
import fcntl
import commands
import threading
import fcntl
import commands
-import sioc
-
import logger
import logger
-
+try:
+ import sioc
+except:
+ pass
PID_FILE = '/var/run/nm.pid'
PID_FILE = '/var/run/nm.pid'
@@
-21,7
+22,7
@@
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
if line.startswith("NET_DEVICE"):
return line.split("=")[1].strip().strip('"')
return None