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

displaymanager: Make the settings follow the naming convention.

Browse Source 
Make the defaultDesktopEnvironment and desktopFile settings in
displaymanager.conf follow the naming convention used in the other .conf
files.
This commit is contained in:
Kevin Kofler 2014-12-01 03:30:42 +01:00
parent a54067f709
commit b411a66baf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,9 +12,9 @@ displaymanagers:
- kdm - kdm
#Enable the following settings to force a desktop environment in your displaymanager configuration file: #Enable the following settings to force a desktop environment in your displaymanager configuration file:
#default_desktop_environment: #defaultDesktopEnvironment:
# executable: "startkde" # executable: "startkde"
# desktop_file: "plasma" # desktopFile: "plasma"
#If true, try to ensure that the user, group, /var directory etc. for the #If true, try to ensure that the user, group, /var directory etc. for the
#display manager are set up correctly. This is normally done by the distribution #display manager are set up correctly. This is normally done by the distribution

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

@ -212,8 +212,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:
entry = libcalamares.job.configuration["default_desktop_environment"] entry = libcalamares.job.configuration["defaultDesktopEnvironment"]
default_desktop_environment = DesktopEnvironment(entry["executable"], entry["desktop_file"]) default_desktop_environment = DesktopEnvironment(entry["executable"], entry["desktopFile"])
else: else:
default_desktop_environment = find_desktop_environment(root_mount_point) default_desktop_environment = find_desktop_environment(root_mount_point)