From cf1c4bd7aec338f844e0336f66f72c32a40d397b Mon Sep 17 00:00:00 2001 From: Philip Date: Fri, 23 Jun 2017 11:51:47 +0200 Subject: [PATCH] [servicescfg] PEP8 modification --- src/modules/servicescfg/main.py | 37 ++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/src/modules/servicescfg/main.py b/src/modules/servicescfg/main.py index 9091a690e..79968d725 100644 --- a/src/modules/servicescfg/main.py +++ b/src/modules/servicescfg/main.py @@ -4,6 +4,7 @@ # === This file is part of Calamares - === # # Copyright 2016, Artoo +# Copyright 2017, Philip Müller # # Calamares is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,6 +24,7 @@ import libcalamares from libcalamares.utils import target_env_call from os.path import exists, join + class ServicesController: def __init__(self): self.__root = libcalamares.globalstorage.value('rootMountPoint') @@ -40,19 +42,39 @@ class ServicesController: target_env_call(["sed", "-e", pattern, "-i", file]) def configure(self): - self.setExpression('s|^.*rc_shell=.*|rc_shell="/usr/bin/sulogin"|', "/etc/rc.conf") - self.setExpression('s|^.*rc_controller_cgroups=.*|rc_controller_cgroups="YES"|', "/etc/rc.conf") - exp = 's|^.*keymap=.*|keymap="' + libcalamares.globalstorage.value("keyboardLayout") + '"|' + self.setExpression( + 's|^.*rc_shell=.*|rc_shell="/usr/bin/sulogin"|', + "/etc/rc.conf" + ) + self.setExpression( + 's|^.*rc_controller_cgroups=.*|rc_controller_cgroups="YES"|', + "/etc/rc.conf" + ) + exp = 's|^.*keymap=.*|keymap="' \ + + libcalamares.globalstorage.value("keyboardLayout") \ + + '"|' self.setExpression(exp, "/etc/conf.d/keymaps") - self.setExpression('s|pam_systemd.so|pam_ck_connector.so nox11|', "/etc/pam.d/system-login") + self.setExpression( + 's|pam_systemd.so|pam_ck_connector.so nox11|', + "/etc/pam.d/system-login" + ) for dm in libcalamares.globalstorage.value("displayManagers"): exp = 's|^.*DISPLAYMANAGER=.*|DISPLAYMANAGER="' + dm + '"|' self.setExpression(exp, "/etc/conf.d/xdm") if dm == "lightdm": - self.setExpression('s|^.*minimum-vt=.*|minimum-vt=7|', "/etc/lightdm/lightdm.conf") - self.setExpression('s|pam_systemd.so|pam_ck_connector.so nox11|', "/etc/pam.d/lightdm-greeter") + self.setExpression( + 's|^.*minimum-vt=.*|minimum-vt=7|', + "/etc/lightdm/lightdm.conf" + ) + self.setExpression( + 's|pam_systemd.so|pam_ck_connector.so nox11|', + "/etc/pam.d/lightdm-greeter" + ) if exists(join(self.root, "etc/pulse/client.conf")): - self.setExpression('s|autospawn = no|autospawn = yes|', "/etc/pulse/client.conf") + self.setExpression( + 's|autospawn = no|autospawn = yes|', + "/etc/pulse/client.conf" + ) def update(self, action, state): for svc in self.services[state]: @@ -69,6 +91,7 @@ class ServicesController: return None + def run(): """ Setup openrc services """ sc = ServicesController()