Merge pull request #251 from udeved/master

displaymanager: write processed DM list to globalstorage
This commit is contained in:
Teo Mrnjavac 2016-08-19 13:30:28 +02:00 committed by GitHub
commit 7104ef915a

View File

@ -295,8 +295,8 @@ def run():
if "displaymanagers" in libcalamares.job.configuration: if "displaymanagers" in libcalamares.job.configuration:
displaymanagers = libcalamares.job.configuration["displaymanagers"] displaymanagers = libcalamares.job.configuration["displaymanagers"]
if libcalamares.globalstorage.contains("displaymanagers"): if libcalamares.globalstorage.contains("displayManagers"):
displaymanagers = libcalamares.globalstorage.value("displaymanagers") displaymanagers = libcalamares.globalstorage.value("displayManagers")
if displaymanagers is None: if displaymanagers is None:
return "No display managers selected for the displaymanager module.", \ return "No display managers selected for the displaymanager module.", \
@ -434,4 +434,6 @@ def run():
else: else:
libcalamares.utils.debug("Unsetting autologin.") libcalamares.utils.debug("Unsetting autologin.")
libcalamares.globalstorage.insert("displayManagers", displaymanagers)
return set_autologin(username, displaymanagers, default_desktop_environment, root_mount_point) return set_autologin(username, displaymanagers, default_desktop_environment, root_mount_point)