napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[unpackfs] Use the Python mount-API

Browse Source
This commit is contained in:
Adriaan de Groot 2019-06-20 16:14:30 +02:00
parent ba7259d9ee
commit 1b91f831bf
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/unpackfs/main.py
View File

@ -250,22 +250,11 @@ class UnpackOperation:
:param imgmountdir:
"""
if os.path.isdir(entry.source):
subprocess.check_call(["mount",
"--bind", entry.source,
imgmountdir])
libcalamares.utils.mount(entry.source, imgmountdir, "", "--bind")
elif os.path.isfile(entry.source):
subprocess.check_call(["mount",
entry.source,
imgmountdir,
"-t", entry.sourcefs,
"-o", "loop"
])
libcalamares.utils.mount(entry.source, imgmountdir, entry.sourcefs, "loop")
else: # entry.source is a device
subprocess.check_call(["mount",
entry.source,
imgmountdir,
"-t", entry.sourcefs
])
libcalamares.utils.mount(entry.source, imgmountdir, entry.sourcefs, "")
def unpack_image(self, entry, imgmountdir):
"""