applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 01:15:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix unpackfs wrongly excluding separately-mounted partitions.

Browse source 
mount: Remember the extraMounts (and extraMountsEfi, if applicable) in
the global storage (as "extraMounts").

unpackfs: Read the extra mounts from the global storage to generate the
exclude list instead of trying to detect it from the "mount" command's
output, because the latter also includes normally-mounted destination
partitions.

This makes having separate partitions for non-/ mountpoints work again.
This commit is contained in:
Kevin Kofler 2014-12-05 00:17:33 +01:00
parent 20e6cd4ab0
commit e6d65d047b
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/mount/main.py
View file

@ -55,9 +55,16 @@ def run():
mount_partitions(root_mount_point, partitions)
mount_partitions(root_mount_point, extra_mounts)
if(os.path.exists("/sys/firmware/efi/efivars")):
fw_type = libcalamares.globalstorage.value("firmwareType")
if fw_type == 'efi':
mount_partitions(root_mount_point, extra_mounts_efi)
libcalamares.globalstorage.insert("rootMountPoint", root_mount_point)
# Remember the extra mounts for the unpackfs module
if fw_type == 'efi':
libcalamares.globalstorage.insert("extraMounts", extra_mounts + extra_mounts_efi)
else:
libcalamares.globalstorage.insert("extraMounts", extra_mounts)
return None