From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Tue, 11 Dec 2007 18:44:37 +0000 (+0000)
Subject: __do_chroot is also called from chrootcall, which doesn't need to cache it.
X-Git-Tag: util-vserver-pl-0.1-1~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4710e41c018445b51d3049ceb7cb20cda2e4b21b;p=util-vserver-pl.git

__do_chroot is also called from chrootcall, which doesn't need to cache it.
---

diff --git a/python/vserver.py b/python/vserver.py
index 24b4560..c201bc7 100644
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -245,7 +245,6 @@ class VServer:
         return None
 
     def __do_chroot(self):
-        self.config.cache_it()
         os.chroot(self.dir)
         os.chdir("/")
 
@@ -412,6 +411,7 @@ class VServer:
             raise ex
 
     def enter(self):
+        self.config.cache_it()
         self.__do_chroot()
         self.__do_chcontext(None)
 
@@ -434,6 +434,7 @@ class VServer:
                 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: