afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #138 from gsomlo/gls-ns-umount-v2

Browse source 
Gls ns umount v2
This commit is contained in:
Jeff Ahrenholz 2018-02-22 07:57:25 -08:00 • committed by GitHub
commit d0c946ff86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
daemon/core/netns/vnode.py
View file

@ -117,10 +117,9 @@ class SimpleLxcNode(PyCoreNode):
if not self.up: if not self.up:
return return
# unmount all targets # unmount all targets (NOTE: non-persistent mount namespaces are
while self._mounts: # removed by the kernel when last referencing process is killed)
source, target = self._mounts.pop(-1) self._mounts = []
self.umount(target)
# shutdown all interfaces # shutdown all interfaces
for netif in self.netifs(): for netif in self.netifs():
@ -250,19 +249,6 @@ class SimpleLxcNode(PyCoreNode):
except IOError: except IOError:
logger.exception("mounting failed for %s at %s", source, target) logger.exception("mounting failed for %s at %s", source, target)
def umount(self, target):
"""
Unmount a target directory.
:param str target: target directory to unmount
:return: nothing
"""
logger.info("unmounting: %s", target)
try:
self.cmd([constants.UMOUNT_BIN, "-n", "-l", target])
except IOError:
logger.exception("unmounting failed for %s" % target)
def newifindex(self): def newifindex(self):
""" """
Retrieve a new interface index. Retrieve a new interface index.