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

Displaymanager: refactor a little, don't bail out at the first DM that doesn't configure

Browse Source
This commit is contained in:
Adriaan de Groot 2017-06-19 18:00:10 -04:00 committed by Philip
parent 76aa860b73
commit df819f2efb
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,14 +89,15 @@ def have_dm(dm_name, root_mount_point):
def set_autologin(username, def set_autologin(username,
displaymanagers, displaymanager,
default_desktop_environment, default_desktop_environment,
root_mount_point): root_mount_point):
""" """
Enables automatic login for the installed desktop managers. Enables automatic login for the installed desktop managers.
:param username: :param username:
:param displaymanagers: :param displaymanager: str
The displaymanager for which to configure autologin.
:param default_desktop_environment: :param default_desktop_environment:
:param root_mount_point: :param root_mount_point:
""" """
@ -105,7 +106,7 @@ def set_autologin(username,
if username is None: if username is None:
do_autologin = False do_autologin = False
if "mdm" in displaymanagers: if "mdm" == displaymanager:
# Systems with MDM as Desktop Manager # Systems with MDM as Desktop Manager
mdm_conf_path = os.path.join(root_mount_point, "etc/mdm/custom.conf") mdm_conf_path = os.path.join(root_mount_point, "etc/mdm/custom.conf")
@ -142,7 +143,7 @@ def set_autologin(username,
else: else:
mdm_conf.write('AutomaticLoginEnable=False\n') mdm_conf.write('AutomaticLoginEnable=False\n')
if "gdm" in displaymanagers: if "gdm" == displaymanager:
# Systems with GDM as Desktop Manager # Systems with GDM as Desktop Manager
gdm_conf_path = os.path.join(root_mount_point, "etc/gdm/custom.conf") gdm_conf_path = os.path.join(root_mount_point, "etc/gdm/custom.conf")
@ -205,7 +206,7 @@ def set_autologin(username,
) )
) )
if "kdm" in displaymanagers: if "kdm" == displaymanager:
# Systems with KDM as Desktop Manager # Systems with KDM as Desktop Manager
kdm_conf_path = os.path.join( kdm_conf_path = os.path.join(
root_mount_point, "usr/share/config/kdm/kdmrc" root_mount_point, "usr/share/config/kdm/kdmrc"
@ -234,7 +235,7 @@ def set_autologin(username,
"KDM config file {!s} does not exist".format(kdm_conf_path) "KDM config file {!s} does not exist".format(kdm_conf_path)
) )
if "lxdm" in displaymanagers: if "lxdm" == displaymanager:
# Systems with LXDM as Desktop Manager # Systems with LXDM as Desktop Manager
lxdm_conf_path = os.path.join(root_mount_point, "etc/lxdm/lxdm.conf") lxdm_conf_path = os.path.join(root_mount_point, "etc/lxdm/lxdm.conf")
text = [] text = []
@ -258,7 +259,7 @@ def set_autologin(username,
"LXDM config file {!s} does not exist".format(lxdm_conf_path) "LXDM config file {!s} does not exist".format(lxdm_conf_path)
) )
if "lightdm" in displaymanagers: if "lightdm" == displaymanager:
# Systems with LightDM as Desktop Manager # Systems with LightDM as Desktop Manager
# Ideally, we should use configparser for the ini conf file, # Ideally, we should use configparser for the ini conf file,
# but we just do a simple text replacement for now, as it # but we just do a simple text replacement for now, as it
@ -289,7 +290,7 @@ def set_autologin(username,
) )
) )
if "slim" in displaymanagers: if "slim" == displaymanager:
# Systems with Slim as Desktop Manager # Systems with Slim as Desktop Manager
slim_conf_path = os.path.join(root_mount_point, "etc/slim.conf") slim_conf_path = os.path.join(root_mount_point, "etc/slim.conf")
text = [] text = []
@ -316,7 +317,7 @@ def set_autologin(username,
"SLIM config file {!s} does not exist".format(slim_conf_path) "SLIM config file {!s} does not exist".format(slim_conf_path)
) )
if "sddm" in displaymanagers: if "sddm" == displaymanager:
# Systems with Sddm as Desktop Manager # Systems with Sddm as Desktop Manager
sddm_conf_path = os.path.join(root_mount_point, "etc/sddm.conf") sddm_conf_path = os.path.join(root_mount_point, "etc/sddm.conf")
@ -618,8 +619,15 @@ def run():
libcalamares.globalstorage.insert("displayManagers", displaymanagers) libcalamares.globalstorage.insert("displayManagers", displaymanagers)
return set_autologin( dm_setup_message = []
username, displaymanagers, for dm in displaymanagers:
dm_message = set_autologin(
username, dm,
default_desktop_environment, default_desktop_environment,
root_mount_point root_mount_point
) )
if dm_message is not None:
dm_setup_message.append("{!s}: {!s}".format(*dm_message))
if dm_setup_message:
return ("Display manager configuration was incomplete",
"\n".join(dm_setup_message))