x/bareon
Code Issues Proposed changes

Merge "umount_target: umount fusectl filesystem"

Browse Source
This commit is contained in:
Jenkins 2015-11-19 11:37:43 +00:00 committed by Gerrit Code Review
commit ae9b55dfff
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuel_agent/manager.py
View File

@ -472,7 +472,8 @@ class Manager(object):
def umount_target(self, chroot, pseudo=True):
LOG.debug('Umounting target file systems: %s', chroot)
if pseudo:
for path in ('/proc', '/dev', '/sys'):
# umount fusectl (typically mounted at /sys/fs/fuse/connections)
for path in ('/proc', '/dev', '/sys/fs/fuse/connections', '/sys'):
fu.umount_fs(chroot + path)
for fs in self.driver.partition_scheme.fs_sorted_by_depth(
reverse=True):

1
fuel_agent/tests/test_manager.py
View File

@ -763,6 +763,7 @@ none /run/shm tmpfs rw,nosuid,nodev 0 0"""
self.mgr.umount_target('fake_chroot')
self.assertEqual([mock.call('fake_chroot/proc'),
mock.call('fake_chroot/dev'),
mock.call('fake_chroot/sys/fs/fuse/connections'),
mock.call('fake_chroot/sys'),
mock.call('fake_chroot/var/lib'),
mock.call('fake_chroot/boot'),