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

Merge pull request #1996 from Sunderland93/calamares

Browse Source 
greetd: remove autologin copied from the Live ISO
This commit is contained in:
demmm 2022-06-22 14:18:14 +02:00 committed by GitHub
commit 1d1aff5622
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -827,7 +827,7 @@ class DMgreetd(DisplayManager):
self.config_load() self.config_load()
de_command = default_desktop_environment.executable de_command = default_desktop_environment.executable
if os.path.exists(self.os_path("usr/bin/gtkgreed")) and os.path.exists(self.os_path("usr/bin/cage")): if os.path.exists(self.os_path("usr/bin/gtkgreet")) and os.path.exists(self.os_path("usr/bin/cage")):
self.config_data['default_session']['command'] = "cage -s -- gtkgreet" self.config_data['default_session']['command'] = "cage -s -- gtkgreet"
elif os.path.exists(self.os_path("usr/bin/tuigreet")): elif os.path.exists(self.os_path("usr/bin/tuigreet")):
tuigreet_base_cmd = "tuigreet --remember --time --issue --asterisks --cmd " tuigreet_base_cmd = "tuigreet --remember --time --issue --asterisks --cmd "
@ -837,8 +837,12 @@ class DMgreetd(DisplayManager):
else: else:
self.config_data['default_session']['command'] = "agreety --cmd " + de_command self.config_data['default_session']['command'] = "agreety --cmd " + de_command
if do_autologin == True: if do_autologin:
# Log in as user, with given DE
self.config_data['initial_session'] = dict(command = de_command, user = username) self.config_data['initial_session'] = dict(command = de_command, user = username)
elif 'initial_session' in self.config_data:
# No autologin, remove any autologin that was copied from the live ISO
del self.config_data['initial_session']
self.config_write() self.config_write()