applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 19:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[grubcfg] If we only see #GRUB_DISTRIBUTION, it's not been set

Browse source 
- If we update the line, then GRUB_DISTRIBUTION has been set
 - If we don't update the line (e.g. because of *keepDistribution*)
   then a comment doesn't count as "have seen that line".

This means that if we get to the end of the file, with only commented-
out GRUB_DISTRIBUTION lines, and *keepDistribution* is set, then we'll
still write a distribution line -- because otherwise it's not set at all.
This commit is contained in:
Adriaan de Groot 2019-11-04 16:32:14 +01:00
parent c6c861654d
commit 4a0a8083f3
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/modules/grubcfg/main.py
View file

@ -180,7 +180,11 @@ def modify_grub_default(partitions, root_mount_point, distributor):
or lines[i].startswith("GRUB_DISTRIBUTOR")):
if libcalamares.job.configuration.get("keepDistributor", false):
lines[i] = distributor_line
have_distributor_line = True
have_distributor_line = True
else:
# We're not updating because of *keepDistributor*, but if
# this was a comment line, then it's still not been set.
have_distributor_line = not lines[i].startsdwith("#")
else:
lines = []