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

displaymanager: Use a regex to match User= in sddm.conf.

Browse Source 
This ensures we really only match the User= line and not the
RememberLastUser= one.
This commit is contained in:
Kevin Kofler 2014-11-07 02:57:19 +01:00
parent e365864c05
commit 467d78dde6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@
import os import os
import collections import collections
import re
import libcalamares import libcalamares
import subprocess import subprocess
@ -167,7 +168,8 @@ def set_autologin(username, displaymanagers, root_mount_point):
text = sddm_conf.readlines() text = sddm_conf.readlines()
with open(sddm_conf_path, 'w') as sddm_conf: with open(sddm_conf_path, 'w') as sddm_conf:
for line in text: for line in text:
if 'User=' in line: # User= line, possibly commented out
if re.match('\\s*(?:#\\s*)?User=', line):
line = 'User={}\n'.format(username) line = 'User={}\n'.format(username)
sddm_conf.write(line) sddm_conf.write(line)