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

Displaymanager: check alternative locations for kdmrc.

Browse Source 
FIXES #578
This commit is contained in:
Adriaan de Groot 2017-06-19 18:05:34 -04:00
parent 582e4354a7
commit 70af29672d
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,6 +211,17 @@ def set_autologin(username,
kdm_conf_path = os.path.join( kdm_conf_path = os.path.join(
root_mount_point, "usr/share/config/kdm/kdmrc" 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 = [] text = []
if os.path.exists(kdm_conf_path): if os.path.exists(kdm_conf_path):