parse deleted mountpoints

Related: https://pagure.io/koji/issue/387
This commit is contained in:
Tomas Kopecek 2017-05-02 11:51:44 +02:00 committed by Mike McLean
parent 6f06ee498f
commit 32fa7f0435
2 changed files with 5 additions and 1 deletions

View file

@ -37,9 +37,13 @@ def scan_mounts(topdir):
mplist = []
topdir = os.path.normpath(topdir)
fo = open('/proc/mounts', 'r')
logger = logging.getLogger("koji.build")
for line in fo.readlines():
path = line.split()[1]
if path.startswith(topdir):
if path.endswith('\040(deleted)'):
path = path[:-10]
logger.warning('Found deleted mountpoint: %s' % path)
mplist.append(path)
fo.close()
#reverse sort so deeper dirs come first

View file

@ -20,7 +20,7 @@ def get_fake_mounts_file():
'proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0\n'
'devtmpfs /dev devtmpfs rw,seclabel,nosuid,size=238836k,nr_inodes=59709,mode=755 0 0\n'
'securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0\n'
'tmpfs /dev/shm tmpfs rw,seclabel,nosuid,nodev 0 0\n'
'tmpfs /dev/shm\040(deleted) tmpfs rw,seclabel,nosuid,nodev 0 0\n'
'devpts /dev/pts devpts rw,seclabel,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0\n'
'tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0\n'
'tmpfs /sys/fs/cgroup tmpfs ro,seclabel,nosuid,nodev,noexec,mode=755 0 0\n'