From b411a66bafee6ddba37a14593bfcf7721e5f0ec3 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 1 Dec 2014 03:30:42 +0100 Subject: [PATCH] displaymanager: Make the settings follow the naming convention. Make the defaultDesktopEnvironment and desktopFile settings in displaymanager.conf follow the naming convention used in the other .conf files. --- src/modules/displaymanager/displaymanager.conf | 4 ++-- src/modules/displaymanager/main.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/displaymanager/displaymanager.conf b/src/modules/displaymanager/displaymanager.conf index e9f9a6fe3..59ad061dc 100644 --- a/src/modules/displaymanager/displaymanager.conf +++ b/src/modules/displaymanager/displaymanager.conf @@ -12,9 +12,9 @@ displaymanagers: - kdm #Enable the following settings to force a desktop environment in your displaymanager configuration file: -#default_desktop_environment: +#defaultDesktopEnvironment: # executable: "startkde" -# desktop_file: "plasma" +# desktopFile: "plasma" #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 diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index e2d7d98a7..859589c2b 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -212,8 +212,8 @@ def run(): root_mount_point = libcalamares.globalstorage.value("rootMountPoint") if "default_desktop_environment" in libcalamares.job.configuration: - entry = libcalamares.job.configuration["default_desktop_environment"] - default_desktop_environment = DesktopEnvironment(entry["executable"], entry["desktop_file"]) + entry = libcalamares.job.configuration["defaultDesktopEnvironment"] + default_desktop_environment = DesktopEnvironment(entry["executable"], entry["desktopFile"]) else: default_desktop_environment = find_desktop_environment(root_mount_point)