openstack
/
fuel-agent
Code Issues Proposed changes

Merge "Fix umount fuse control filesystem error"

This commit is contained in:
Jenkins 2016-11-22 09:56:28 +00:00 committed by Gerrit Code Review
parent 35d08b7061 01d7633e87
commit 766969615a
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuel_agent/manager.py
View File

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

2
fuel_agent/tests/test_manager.py
View File

@ -843,7 +843,6 @@ class TestManager(unittest2.TestCase):
fake_mtab = """
proc /proc proc rw,noexec,nosuid,nodev 0 0
sysfs /sys sysfs rw,noexec,nosuid,nodev 0 0
none /sys/fs/fuse/connections fusectl rw 0 0
none /sys/kernel/debug debugfs rw 0 0
none /sys/kernel/security securityfs rw 0 0
udev /dev devtmpfs rw,mode=0755 0 0
@ -893,7 +892,6 @@ 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'),