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

[displaymanager] Fix bug with find_preferred_greeters()

Browse Source
This commit is contained in:
dalto 2023-03-05 13:58:13 -06:00
parent f5b974984c
commit 079f608700
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -444,7 +444,6 @@ class DMgdm(DisplayManager):
userfile.write("Icon=\n") userfile.write("Icon=\n")
def basic_setup(self): def basic_setup(self):
if libcalamares.utils.target_env_call( if libcalamares.utils.target_env_call(
['getent', 'group', 'gdm'] ['getent', 'group', 'gdm']
@ -598,7 +597,6 @@ class DMlightdm(DisplayManager):
_("LightDM config file {!s} does not exist").format(lightdm_conf_path) _("LightDM config file {!s} does not exist").format(lightdm_conf_path)
) )
def basic_setup(self): def basic_setup(self):
libcalamares.utils.target_env_call( libcalamares.utils.target_env_call(
['mkdir', '-p', '/run/lightdm'] ['mkdir', '-p', '/run/lightdm']
@ -638,7 +636,7 @@ class DMlightdm(DisplayManager):
) )
) )
def find_preferred_greeter(self, greeters_dir): def find_preferred_greeter(self):
""" """
On Debian, lightdm-greeter.desktop is typically a symlink managed On Debian, lightdm-greeter.desktop is typically a symlink managed
by update-alternatives pointing to /etc/alternatives/lightdm-greeter by update-alternatives pointing to /etc/alternatives/lightdm-greeter
@ -660,7 +658,6 @@ class DMlightdm(DisplayManager):
return desktop_names[0] return desktop_names[0]
return None return None
def greeter_setup(self): def greeter_setup(self):
lightdm_conf_path = os.path.join(self.root_mount_point, "etc/lightdm/lightdm.conf") lightdm_conf_path = os.path.join(self.root_mount_point, "etc/lightdm/lightdm.conf")
greeter_path = self.find_preferred_greeter() greeter_path = self.find_preferred_greeter()
@ -689,6 +686,7 @@ class DMlightdm(DisplayManager):
_("No LightDM greeter installed.") _("No LightDM greeter installed.")
) )
class DMslim(DisplayManager): class DMslim(DisplayManager):
name = "slim" name = "slim"
executable = "slim" executable = "slim"