mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 13:58:34 +00:00
Code Issues Releases Wiki Activity

zdtm: Don't fail in __construct_root if entries exist

Browse Source 
Otherwise we might get

 | OSError: [Errno 17] File exists: '/tmp/criu-root-f8klhI/bin'
 |     os.symlink(".." + ldir, self.root + "/usr" + ldir)
 | OSError: [Errno 17] File exists
 |  File "zdtm.py", line 209, in __mknod
 |     os.mknod(name, stat.S_IFCHR, rdev)
 | OSError: [Errno 17] File exists

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Cyrill Gorcunov
2018-05-15 11:12:38 +03:00
committed by Andrei Vagin
parent a77d172d1e
commit b44d39ba5d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/zdtm.py
View File

@@ -214,16 +214,19 @@ class ns_flavor:
rdev = os.stat(name).st_rdev rdev = os.stat(name).st_rdev
name = self.root + name name = self.root + name
os.mknod(name, stat.S_IFCHR, rdev) if not os.access(name, os.F_OK):
os.chmod(name, 0666) os.mknod(name, stat.S_IFCHR, rdev)
os.chmod(name, 0666)
def __construct_root(self): def __construct_root(self):
for dir in self.__root_dirs: for dir in self.__root_dirs:
os.mkdir(self.root + dir) if not os.access(self.root + dir, os.F_OK):
os.chmod(self.root + dir, 0777) os.mkdir(self.root + dir)
os.chmod(self.root + dir, 0777)
for ldir in ["/bin", "/sbin", "/lib", "/lib64"]: for ldir in ["/bin", "/sbin", "/lib", "/lib64"]:
os.symlink(".." + ldir, self.root + "/usr" + ldir) if not os.access(self.root + "/usr" + ldir, os.F_OK):
os.symlink(".." + ldir, self.root + "/usr" + ldir)
self.__mknod("tty", os.makedev(5, 0)) self.__mknod("tty", os.makedev(5, 0))
self.__mknod("null", os.makedev(1, 3)) self.__mknod("null", os.makedev(1, 3))