From 6f78ecab3bfd503b47e0a473111deec892c89b1e Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Fri, 28 Nov 2014 18:51:08 +0100 Subject: [PATCH] displaymanager: Fix the default_desktop_environment option. 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. --- src/modules/displaymanager/displaymanager.conf | 4 ++-- src/modules/displaymanager/main.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/modules/displaymanager/displaymanager.conf b/src/modules/displaymanager/displaymanager.conf index 6d5249796..443f5061c 100644 --- a/src/modules/displaymanager/displaymanager.conf +++ b/src/modules/displaymanager/displaymanager.conf @@ -12,7 +12,7 @@ displaymanagers: - kdm #Enable followed settings to force a destop environment in your displaymanager configuration file -#default_desktop_environment: -# - executable: "startkde" +#default_desktop_environment: +# executable: "startkde" # desktop_file: "plasma" diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 8c97787c6..57ecaec15 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -203,9 +203,8 @@ def run(): root_mount_point = libcalamares.globalstorage.value("rootMountPoint") if "default_desktop_environment" in libcalamares.job.configuration: - for entry in libcalamares.job.configuration["default_desktop_environment"]: - executable = entry["executable"] - desktop_file = entry["desktop_file"] + entry = libcalamares.job.configuration["default_desktop_environment"]: + default_desktop_environment = DesktopEnvironment(entry["executable"], entry["desktop_file"]) if default_desktop_environment is None: default_desktop_environment = find_desktop_environment(root_mount_point)