Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

Fix #166: pmbootstrap shutdown: umount deep folder levels first (#274)

Browse source 
* Refactored `umount_all` to get the list of folders to be umounted from
  `umount_all_list`, so we can test that function in a test case.
* Adjusted `umount_all_list` to return the deep folder levels first
* Added a testcase for that
* Remove redundant calls to `umount_all()` (which were from a time before
  `pmbootstrap` was released, in which failing commands did not cause
  `pmbootstrap` to raise an exception)
This commit is contained in:
Oliver Smith 2017-07-27 18:14:02 +00:00 • committed by GitHub
parent 3be2fce72f
commit 10bf08dca1
3 changed files with 73 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

39
pmb/helpers/mount.py
View file

@ -60,10 +60,12 @@ def bind(args, source, destination, create_folders=True):
if not ismount(destination):
raise RuntimeError("Mount failed: " + source + " -> " + destination)
# Mount a blockdevice
def bind_blockdevice(args, source, destination):
"""
Mount a blockdevice with the --bind option, and create the destination
file, if necessary.
"""
# Skip existing mountpoint
if ismount(destination):
return
@ -77,16 +79,31 @@ def bind_blockdevice(args, source, destination):
destination])
def umount_all_list(prefix, source="/proc/mounts"):
"""
Parses `/proc/mounts` for all folders beginning with a prefix.
:source: can be changed for testcases
:returns: a list of folders, that need to be umounted
"""
ret = []
prefix = os.path.abspath(prefix)
with open(source, "r") as handle:
for line in handle:
words = line.split()
if len(words) < 2:
raise RuntimeError("Failed to parse line in " + source + ": " +
line)
if words[1].startswith(prefix):
ret.append(words[1])
ret.sort(reverse=True)
return ret
def umount_all(args, folder):
"""
Umount all folders, that are mounted inside a given folder.
"""
folder = os.path.abspath(folder)
with open("/proc/mounts", "r") as handle:
for line in handle:
words = line.split()
if len(words) < 2 or not words[1].startswith(folder):
continue
pmb.helpers.run.root(args, ["umount", words[1]])
if ismount(words[1]):
raise RuntimeError("Failed to umount: " + words[1])
for mountpoint in umount_all_list(folder):
pmb.helpers.run.root(args, ["umount", mountpoint])
if ismount(mountpoint):
raise RuntimeError("Failed to umount: " + mountpoint)