Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIX: Pylint + Container mount
[csit.git]
/
resources
/
libraries
/
python
/
ContainerUtils.py
diff --git
a/resources/libraries/python/ContainerUtils.py
b/resources/libraries/python/ContainerUtils.py
index
cd48fc6
..
6fea804
100644
(file)
--- a/
resources/libraries/python/ContainerUtils.py
+++ b/
resources/libraries/python/ContainerUtils.py
@@
-635,13
+635,16
@@
class LXC(ContainerEngine):
if self.container.mnt:
for mount in self.container.mnt:
host_dir, guest_dir = mount.split(':')
if self.container.mnt:
for mount in self.container.mnt:
host_dir, guest_dir = mount.split(':')
+ if host_dir.endswith('/'):
+ self.container.ssh.exec_command_sudo(
+ "sh -c 'mkdir -p {host_dir}'".format(host_dir=host_dir))
options = 'bind,create=dir' \
if guest_dir.endswith('/') else 'bind,create=file'
entry = 'lxc.mount.entry = {host_dir} '\
options = 'bind,create=dir' \
if guest_dir.endswith('/') else 'bind,create=file'
entry = 'lxc.mount.entry = {host_dir} '\
- '
/var/lib/lxc/{c.name}/rootfs
{guest_dir} none ' \
+ '{guest_dir} none ' \
'{options} 0 0'.format(c=self.container,
host_dir=host_dir,
'{options} 0 0'.format(c=self.container,
host_dir=host_dir,
- guest_dir=guest_dir,
+ guest_dir=guest_dir
[1:]
,
options=options)
ret, _, _ = self.container.ssh.exec_command_sudo(
"sh -c 'echo \"{e}\" >> /var/lib/lxc/{c.name}/config'".
options=options)
ret, _, _ = self.container.ssh.exec_command_sudo(
"sh -c 'echo \"{e}\" >> /var/lib/lxc/{c.name}/config'".