From 00cedeaf3b9cb5f9eb967ce4e0bffb78aa2d232c Mon Sep 17 00:00:00 2001 From: Dmitry Teselkin Date: Sat, 14 Nov 2015 23:23:29 +0300 Subject: [PATCH] umount_target: umount fusectl filesystem Typically mounted on /sys/fs/fuse/connections. Change-Id: Ibb681d67c23cbeb8e48465f1b45cbd244add0ade --- fuel_agent/manager.py | 3 ++- fuel_agent/tests/test_manager.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fuel_agent/manager.py b/fuel_agent/manager.py index 4520cc8..5e916ef 100644 --- a/fuel_agent/manager.py +++ b/fuel_agent/manager.py @@ -418,7 +418,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): diff --git a/fuel_agent/tests/test_manager.py b/fuel_agent/tests/test_manager.py index bde1abe..7a38239 100644 --- a/fuel_agent/tests/test_manager.py +++ b/fuel_agent/tests/test_manager.py @@ -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'),