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

feat(greetd): add more greeter fallbacks

Browse Source
This commit is contained in:
Jonas Strassel 2021-10-28 08:14:04 +02:00
parent e5f5ef0d17
commit fbdb9e6779
No known key found for this signature in database
GPG Key ID: ABB2075D5F310CF8
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -844,13 +844,17 @@ class DMgreetd(DisplayManager):
return os.path.join(self.root_mount_point, path) return os.path.join(self.root_mount_point, path)
def config_path(self): def config_path(self):
return self.os_path("etc/greetd/config.toml") path = self.os_path("etc/greetd/config.toml")
if not os.path.exists(path):
open(path, 'a').close()
return path
def environments_path(self): def environments_path(self):
return self.os_path("etc/greetd/environments") return self.os_path("etc/greetd/environments")
def config_load(self): def config_load(self):
self.config_data = toml.loads(self.config_path()) self.config_data = toml.loads(self.config_path())
return self.config_data
def config_write(self): def config_write(self):
toml.dump(self.config_data, self.config_path()) toml.dump(self.config_data, self.config_path())
@ -888,13 +892,17 @@ class DMgreetd(DisplayManager):
def set_autologin(self, username, do_autologin, default_desktop_environment): def set_autologin(self, username, do_autologin, default_desktop_environment):
self.config_load() self.config_load()
if (os.path.exists(self.os_path("usr/bin/tuigreet"))): if os.path.exists(self.os_path("usr/bin/gtkgreed") and os.path.exists(self.os_path("usr/bin/cage")):
self.config_data['default_session']['command'] = "cage gtkgreet"
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 "
self.config_data['default_session']['command'] = tuigreet_base_cmd + default_desktop_environment self.config_data['default_session']['command'] = tuigreet_base_cmd + default_desktop_environment
elif os.path.exists(self.os_path("usr/bin/ddlm")):
self.config_data['default_session']['command'] = "ddlm --target sway"
else: else:
print("no greeter detected") self.config_data['default_session']['command'] = "agreety --cmd " + default_desktop_environment
if (do_autologin == True): if do_autologin == True:
self.config_data['initial_session'] = {} self.config_data['initial_session'] = {}
self.config_data['initial_session']['command'] = default_desktop_environment self.config_data['initial_session']['command'] = default_desktop_environment
self.config_data['initial_session']['user'] = username self.config_data['initial_session']['user'] = username