git://git.onelab.eu
/
util-vserver-pl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't clean stuff up if it's already running.
[util-vserver-pl.git]
/
python
/
vserver.py
diff --git
a/python/vserver.py
b/python/vserver.py
index
e4afacd
..
aee6d03
100644
(file)
--- a/
python/vserver.py
+++ b/
python/vserver.py
@@
-467,7
+467,7
@@
class VServer:
# open state file to record vserver info
state_file = open("/var/run/vservers/%s" % self.name, "w")
# open state file to record vserver info
state_file = open("/var/run/vservers/%s" % self.name, "w")
- # use /dev/null for stdin, /var/log/
boot.log
for stdout/err
+ # use /dev/null for stdin, /var/log/
nm
for stdout/err
fd = os.open("/dev/null", os.O_RDONLY)
if fd != 0:
os.dup2(fd, 0)
fd = os.open("/dev/null", os.O_RDONLY)
if fd != 0:
os.dup2(fd, 0)
@@
-478,7
+478,8
@@
class VServer:
self.config.cache_it()
self.__do_chroot()
self.config.cache_it()
self.__do_chroot()
- removed = self.__cleanvar()
+ if not self.is_running():
+ removed = self.__cleanvar()
log = open("/var/log/nm", "a", 0)
if log.fileno() != 1:
log = open("/var/log/nm", "a", 0)
if log.fileno() != 1: