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

[displaymanager] simplify code

Browse Source
This commit is contained in:
Philip 2017-06-28 09:56:50 +02:00
parent 59588672ed
commit cd3e631027
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
# #
# === This file is part of Calamares - <http://github.com/calamares> === # === This file is part of Calamares - <http://github.com/calamares> ===
# #
# Copyright 2014-2016, Philip Müller <philm@manjaro.org> # Copyright 2014-2017, Philip Müller <philm@manjaro.org>
# Copyright 2014-2015, Teo Mrnjavac <teo@kde.org> # Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
# Copyright 2014, Kevin Kofler <kevin.kofler@chello.at> # Copyright 2014, Kevin Kofler <kevin.kofler@chello.at>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
@ -405,7 +405,6 @@ def run():
# setup lightdm # setup lightdm
if "lightdm" in displaymanagers: if "lightdm" in displaymanagers:
if have_dm("lightdm", root_mount_point): if have_dm("lightdm", root_mount_point):
global lightdm_conf_path
lightdm_conf_path = os.path.join( lightdm_conf_path = os.path.join(
root_mount_point, "etc/lightdm/lightdm.conf" root_mount_point, "etc/lightdm/lightdm.conf"
) )
@ -460,15 +459,11 @@ def run():
if (os.path.exists(greeter_path)): if (os.path.exists(greeter_path)):
greeter = os.listdir(greeter_path)[0].split('.')[0] greeter = os.listdir(greeter_path)[0].split('.')[0]
libcalamares.utils.debug("configure {!s}".format(greeter)) libcalamares.utils.debug("configure {!s}".format(greeter))
with open(lightdm_conf_path, 'r') as lightdm_conf: "sed -i -e \"s/^.*greeter-session=.*/greeter-session={!s}/\" "
text = lightdm_conf.readlines() "{!s}".format(
greeter,
with open(lightdm_conf_path, 'w') as lightdm_conf: lightdm_conf_path
for line in text: )
if line.startswith("#greeter-session="):
line = "greeter-session={!s}\n".format(greeter)
lightdm_conf.write(line)
else: else:
return ("No lightdm greeter installed.") return ("No lightdm greeter installed.")
else: else: