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

[mount] Warn if chcon is missing, rather than fail

Browse Source 
FIXES #1429
This commit is contained in:
Adriaan de Groot 2020-06-09 13:24:12 +02:00
parent 5126aaae19
commit 35fb8dcc27
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/mount/main.py
View File

@ -52,8 +52,13 @@ def mount_partition(root_mount_point, partition, partitions):
# Ensure that the created directory has the correct SELinux context on # Ensure that the created directory has the correct SELinux context on
# SELinux-enabled systems. # SELinux-enabled systems.
os.makedirs(mount_point, exist_ok=True) os.makedirs(mount_point, exist_ok=True)
subprocess.call(['chcon', '--reference=' + raw_mount_point, try:
mount_point]) subprocess.call(['chcon', '--reference=' + raw_mount_point, mount_point])
except FileNotFoundError as e:
libcalamares.utils.warning(str(e))
except OSError:
libcalamares.utils.error("Cannot run 'chcon' normally.")
raise
fstype = partition.get("fs", "").lower() fstype = partition.get("fs", "").lower()