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

Merge pull request #244 from hmikihth/master

Browse Source 
Support the already mounted loop fs (example in the blackPanther OS)
This commit is contained in:
Teo Mrnjavac 2016-07-26 10:05:53 +02:00 committed by GitHub
commit 41ee4096a6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,7 +198,10 @@ class UnpackOperation:
:param entry:
:param imgmountdir:
"""
subprocess.check_call(["mount", entry.source, imgmountdir, "-t", entry.sourcefs, "-o", "loop"])
if os.path.isdir(entry.source):
subprocess.check_call(["mount", "--bind", entry.source, imgmountdir])
else:
subprocess.check_call(["mount", entry.source, imgmountdir, "-t", entry.sourcefs, "-o", "loop"])
def unpack_image(self, entry, imgmountdir):
""" Unpacks image.
@ -278,7 +281,7 @@ def run():
destination = os.path.abspath(root_mount_point + entry["destination"])
if not os.path.exists(source) or os.path.isdir(source):
if not os.path.exists(source):
return "Bad source", "source=\"{}\"".format(source)
if not os.path.isdir(destination):