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

displaymanager: Fix the default_desktop_environment option.

Browse Source 
Do not use a YAML list when only a single entry actually works. (It was
just silently using the last one.)

Create the default_desktop_environment DesktopEnvironment tuple. Before,
the setting was silently ignored altogether.
This commit is contained in:
Kevin Kofler 2014-11-28 18:51:08 +01:00
parent e65d9c4f4d
commit 6f78ecab3b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/displaymanager/displaymanager.conf
View File

@ -12,7 +12,7 @@ displaymanagers:
- kdm - kdm
#Enable followed settings to force a destop environment in your displaymanager configuration file #Enable followed settings to force a destop environment in your displaymanager configuration file
#default_desktop_environment: #default_desktop_environment:
# - executable: "startkde" # executable: "startkde"
# desktop_file: "plasma" # desktop_file: "plasma"

5
src/modules/displaymanager/main.py
View File

@ -203,9 +203,8 @@ def run():
root_mount_point = libcalamares.globalstorage.value("rootMountPoint") root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
if "default_desktop_environment" in libcalamares.job.configuration: if "default_desktop_environment" in libcalamares.job.configuration:
for entry in libcalamares.job.configuration["default_desktop_environment"]: entry = libcalamares.job.configuration["default_desktop_environment"]:
executable = entry["executable"] default_desktop_environment = DesktopEnvironment(entry["executable"], entry["desktop_file"])
desktop_file = entry["desktop_file"]
if default_desktop_environment is None: if default_desktop_environment is None:
default_desktop_environment = find_desktop_environment(root_mount_point) default_desktop_environment = find_desktop_environment(root_mount_point)