From 136ec3df585adb591844641af8fef04526470b1c Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Wed, 22 Jun 2022 11:49:21 +0400 Subject: [PATCH 1/2] greetd: remove autologin copied from the Live ISO (fixes #1995) --- src/modules/displaymanager/main.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 2b49a595c..cf80383ef 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -837,8 +837,12 @@ class DMgreetd(DisplayManager): else: 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) + 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() From 464a9ac50352fefba1ef7dbac37383c6d64257ee Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Wed, 22 Jun 2022 11:52:14 +0400 Subject: [PATCH 2/2] greetd: fix typo in gtkgreet path --- src/modules/displaymanager/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index cf80383ef..f908bc441 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -827,7 +827,7 @@ class DMgreetd(DisplayManager): self.config_load() 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" elif os.path.exists(self.os_path("usr/bin/tuigreet")): tuigreet_base_cmd = "tuigreet --remember --time --issue --asterisks --cmd "