Merge branch 'master' of https://github.com/calamares/calamares into development

This commit is contained in:
Philip Müller 2019-11-18 11:11:33 +01:00
commit a9d9a19e35

View File

@ -185,7 +185,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
have_kernel_cmd = True have_kernel_cmd = True
elif (lines[i].startswith("#GRUB_DISTRIBUTOR") elif (lines[i].startswith("#GRUB_DISTRIBUTOR")
or lines[i].startswith("GRUB_DISTRIBUTOR")): or lines[i].startswith("GRUB_DISTRIBUTOR")):
if libcalamares.job.configuration.get("keepDistributor", false): if libcalamares.job.configuration.get("keepDistributor", False):
lines[i] = distributor_line lines[i] = distributor_line
have_distributor_line = True have_distributor_line = True
else: else: