From 32fa7f04358b60ea450d59f140347baee21e3c19 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: May 17 2017 17:04:06 +0000 Subject: parse deleted mountpoints Related: https://pagure.io/koji/issue/387 --- diff --git a/koji/tasks.py b/koji/tasks.py index 3664481..9591c23 100644 --- a/koji/tasks.py +++ b/koji/tasks.py @@ -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 diff --git a/tests/test_tasks.py b/tests/test_tasks.py index cc69e36..c66d5f6 100644 --- a/tests/test_tasks.py +++ b/tests/test_tasks.py @@ -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'