From 1c0b9e6a2a878027879e6a2c8d962f4215ec6a05 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 20 Aug 2018 09:56:15 -0400 Subject: [PATCH] [displaymanager] Call basic_setup through instance - Now that basic_setup is factored out into the classes, call it via an instance before doing set_autologin. --- src/modules/displaymanager/main.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 34f7a112b..1c1585f22 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -778,7 +778,12 @@ def run(): for dm in displaymanagers: impl = [ cls for name, cls in display_managers if name == dm ] if len(impl) == 1: - dm_message = impl[0]().set_autologin(username, default_desktop_environment, root_mount_point) + dm_impl = impl[0]() # Instantiate the class that was named + dm_message = None + if enable_basic_setup: + dm_message = dm_impl.basic_setup() + if dm_message is None: + dm_message = dm_impl.set_autologin(username, default_desktop_environment, root_mount_point) else: dm_message = ("Can not configure {!s}".format(dm), "{!s} has {!d} implementation classes.".format(dm).format(len(impl)))