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
__do_chroot is also called from chrootcall, which doesn't need to cache it.
[util-vserver-pl.git]
/
python
/
vserver.py
diff --git
a/python/vserver.py
b/python/vserver.py
index
24b4560
..
c201bc7
100644
(file)
--- a/
python/vserver.py
+++ b/
python/vserver.py
@@
-245,7
+245,6
@@
class VServer:
return None
def __do_chroot(self):
return None
def __do_chroot(self):
- self.config.cache_it()
os.chroot(self.dir)
os.chdir("/")
os.chroot(self.dir)
os.chdir("/")
@@
-412,6
+411,7
@@
class VServer:
raise ex
def enter(self):
raise ex
def enter(self):
+ self.config.cache_it()
self.__do_chroot()
self.__do_chcontext(None)
self.__do_chroot()
self.__do_chcontext(None)
@@
-434,6
+434,7
@@
class VServer:
if fd != 0:
os.dup2(fd, 0)
os.close(fd)
if fd != 0:
os.dup2(fd, 0)
os.close(fd)
+ self.config.cache_it()
self.__do_chroot()
log = open("/var/log/boot.log", "w", 0)
if log.fileno() != 1:
self.__do_chroot()
log = open("/var/log/boot.log", "w", 0)
if log.fileno() != 1: