Blame calamares-3.2.7-unpackfs-dev.patch
|
Kevin Kofler |
bd20b19 |
diff -ur calamares-3.2.7/src/modules/unpackfs/main.py calamares-3.2.7-unpackfs-dev/src/modules/unpackfs/main.py
|
|
Kevin Kofler |
bd20b19 |
--- calamares-3.2.7/src/modules/unpackfs/main.py 2019-04-27 20:12:03.000000000 +0200
|
|
Kevin Kofler |
82ed993 |
+++ calamares-3.2.7-unpackfs-dev/src/modules/unpackfs/main.py 2019-05-06 00:49:55.325039262 +0200
|
|
Kevin Kofler |
bd20b19 |
@@ -252,13 +252,19 @@
|
|
Kevin Kofler |
bd20b19 |
subprocess.check_call(["mount",
|
|
Kevin Kofler |
bd20b19 |
"--bind", entry.source,
|
|
Kevin Kofler |
bd20b19 |
imgmountdir])
|
|
Kevin Kofler |
bd20b19 |
- else:
|
|
Kevin Kofler |
82ed993 |
+ elif os.path.isfile(entry.source):
|
|
Kevin Kofler |
bd20b19 |
subprocess.check_call(["mount",
|
|
Kevin Kofler |
bd20b19 |
entry.source,
|
|
Kevin Kofler |
bd20b19 |
imgmountdir,
|
|
Kevin Kofler |
bd20b19 |
"-t", entry.sourcefs,
|
|
Kevin Kofler |
bd20b19 |
"-o", "loop"
|
|
Kevin Kofler |
bd20b19 |
])
|
|
Kevin Kofler |
bd20b19 |
+ else: # entry.source is a device
|
|
Kevin Kofler |
bd20b19 |
+ subprocess.check_call(["mount",
|
|
Kevin Kofler |
bd20b19 |
+ entry.source,
|
|
Kevin Kofler |
bd20b19 |
+ imgmountdir,
|
|
Kevin Kofler |
bd20b19 |
+ "-t", entry.sourcefs
|
|
Kevin Kofler |
bd20b19 |
+ ])
|
|
Kevin Kofler |
bd20b19 |
|
|
Kevin Kofler |
bd20b19 |
def unpack_image(self, entry, imgmountdir):
|
|
Kevin Kofler |
bd20b19 |
"""
|