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

Unbreak autologin setting.

Browse Source
This commit is contained in:
Teo Mrnjavac 2017-01-24 18:55:32 +01:00
parent 1d5aba5e25
commit 68e2c4f901
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,19 +261,16 @@ def set_autologin(username, displaymanagers, default_desktop_environment, root_m
if os.path.isfile(sddm_conf_path): if os.path.isfile(sddm_conf_path):
sddm_config.read(sddm_conf_path) sddm_config.read(sddm_conf_path)
autologin_section = {} if 'Autologin' not in sddm_config:
if 'Autologin' in sddm_config: sddm_config.add_section('Autologin')
autologin_section = sddm_config['Autologin']
if do_autologin: if do_autologin:
autologin_section['User'] = username sddm_config.set('Autologin', 'User', username)
elif 'User' in autologin_section: elif sddm_config.has_option('Autologin', 'User'):
del autologin_section['User'] sddm_config.remove_option('Autologin', 'User')
if default_desktop_environment is not None: if default_desktop_environment is not None:
autologin_section['Session'] = default_desktop_environment.desktop_file sddm_config.set('Autologin', 'Session', default_desktop_environment.desktop_file)
sddm_config['Autologin'] = autologin_section
with open(sddm_conf_path, 'w') as sddm_config_file: with open(sddm_conf_path, 'w') as sddm_config_file:
sddm_config.write(sddm_config_file, space_around_delimiters=False) sddm_config.write(sddm_config_file, space_around_delimiters=False)
@ -351,7 +348,7 @@ def run():
if default_desktop_environment.desktop_file == "deepin": if default_desktop_environment.desktop_file == "deepin":
os.system("sed -i -e \"s/^.greeter-session=.*/greeter-session=lightdm-deepin-greeter/\" {!s}/etc/lightdm/lightdm.conf".format( os.system("sed -i -e \"s/^.greeter-session=.*/greeter-session=lightdm-deepin-greeter/\" {!s}/etc/lightdm/lightdm.conf".format(
root_mount_point)) root_mount_point))
else: else:
libcalamares.utils.debug("lightdm selected but not installed") libcalamares.utils.debug("lightdm selected but not installed")
displaymanagers.remove("lightdm") displaymanagers.remove("lightdm")
@ -437,5 +434,5 @@ def run():
libcalamares.utils.debug("Unsetting autologin.") libcalamares.utils.debug("Unsetting autologin.")
libcalamares.globalstorage.insert("displayManagers", displaymanagers) libcalamares.globalstorage.insert("displayManagers", displaymanagers)
return set_autologin(username, displaymanagers, default_desktop_environment, root_mount_point) return set_autologin(username, displaymanagers, default_desktop_environment, root_mount_point)