From 182c3bdcd07e00c9702ab2c8b6e7aaa0bb84612b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 19 Jun 2017 18:05:34 -0400 Subject: [PATCH] Displaymanager: check alternative locations for kdmrc. FIXES #578 --- src/modules/displaymanager/main.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 8c66e899f..e6c057f71 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -211,6 +211,17 @@ def set_autologin(username, kdm_conf_path = os.path.join( root_mount_point, "usr/share/config/kdm/kdmrc" ) + # Check which path is in use: SUSE does something else. + # Also double-check the default setting. Pick the first + # one that exists in the target. + for candidate_kdmrc in ( + "usr/share/config/kdm/kdmrc", + "usr/share/kde4/config/kdm/kdmrc", + ): + p = os.path.join(root_mount_point, candidate_kdmrc) + if os.path.exists(p): + kdm_conf_path = p + break text = [] if os.path.exists(kdm_conf_path):