X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FContainerUtils.py;h=6fea8044434dbe702939b42c61b73bac802ad157;hb=9efba1d574916eded1a6d4d8580e092a8831033b;hp=cd48fc6c1f3ad177113296176d84d59a697015f5;hpb=c4528bcd137c0813d34b1b248bc92670736e78e6;p=csit.git diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index cd48fc6c1f..6fea804443 100644 --- 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 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} '\ - '/var/lib/lxc/{c.name}/rootfs{guest_dir} none ' \ + '{guest_dir} none ' \ '{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'".