From ff0bdfbc523ac8dbcb885361f06c6a329ca502cb Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 22 Aug 2020 12:45:55 +0200 Subject: lcd: T2564: add CLI support - set system lcd model - set system lcd device --- src/conf_mode/system_lcd.py | 110 ++++++++++++++++++++++++++++++++++++++++++++ src/systemd/LCDd.service | 11 +++++ src/systemd/lcdproc.service | 13 ++++++ 3 files changed, 134 insertions(+) create mode 100755 src/conf_mode/system_lcd.py create mode 100644 src/systemd/LCDd.service create mode 100644 src/systemd/lcdproc.service (limited to 'src') diff --git a/src/conf_mode/system_lcd.py b/src/conf_mode/system_lcd.py new file mode 100755 index 000000000..7cdc1fd92 --- /dev/null +++ b/src/conf_mode/system_lcd.py @@ -0,0 +1,110 @@ +#!/usr/bin/env python3 +# +# Copyright 2020 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import os +import vyos.defaults + +from jinja2 import FileSystemLoader, Environment +from sys import exit + +from vyos.config import Config +from vyos import ConfigError + +lcdd_conf = '/run/LCDd/LCDd.conf' +lcdproc_conf = '/run/lcdproc/lcdproc.conf' + +def get_config(): + base = 'system lcd' + conf = Config() + lcd = {} + if conf.exists(base): + conf.set_level(base) + + if conf.exists('device'): + tmp = conf.return_value('device') + lcd.update({'device' : tmp}) + + if conf.exists('model'): + tmp = conf.return_value('model') + lcd.update({'model' : tmp}) + + # Return (possibly empty) dictionary + return lcd + +def verify(lcd): + if not lcd: + return None + + if 'model' in lcd and lcd['model'] in ['sdec']: + # This is a fixed LCD display, no device needed - bail out early + return None + + if not {'device', 'model'} <= set(lcd): + raise ConfigError('Both device and driver must be set!') + + return None + +def generate(lcd): + if not lcd: + return None + + if 'device' in lcd: + lcd['device'] = '/dev/' + lcd['device'] + + tmpl_path = os.path.join(vyos.defaults.directories['data'], 'templates') + fs_loader = FileSystemLoader(tmpl_path) + env = Environment(loader=fs_loader) + + # create configuration directories + for file in [lcdd_conf, lcdproc_conf]: + path = os.path.dirname(file) + if not os.path.isdir(path): + os.mkdir(path, mode=0o755) + + lcdd_conf_tmpl = env.get_template('lcd/LCDd.conf.tmpl') + tmp = lcdd_conf_tmpl.render(lcd) + with open(lcdd_conf, 'w') as f: + f.write(tmp) + + lcdproc_conf_tmpl = env.get_template('lcd/lcdproc.conf.tmpl') + tmp = lcdproc_conf_tmpl.render(lcd) + with open(lcdproc_conf, 'w') as f: + f.write(tmp) + + return None + +def apply(lcd): + if not lcd: + os.system('sudo systemctl stop lcdproc.service LCDd.service') + + for file in [lcdd_conf, lcdproc_conf]: + if os.path.exists(file): + os.remove(file) + else: + # Restart server + os.system('sudo systemctl restart LCDd.service lcdproc.service') + + return None + +if __name__ == '__main__': + try: + c = get_config() + verify(c) + generate(c) + apply(c) + except ConfigError as e: + print(e) + exit(1) diff --git a/src/systemd/LCDd.service b/src/systemd/LCDd.service new file mode 100644 index 000000000..85cdf561b --- /dev/null +++ b/src/systemd/LCDd.service @@ -0,0 +1,11 @@ +[Unit] +Description=LCD display daemon +Documentation=man:LCDd(8) http://www.lcdproc.org/ +After=vyos-router.service + +[Service] +User=root +ExecStart=/usr/sbin/LCDd -c /run/LCDd/LCDd.conf + +[Install] +WantedBy=multi-user.target diff --git a/src/systemd/lcdproc.service b/src/systemd/lcdproc.service new file mode 100644 index 000000000..ef717667a --- /dev/null +++ b/src/systemd/lcdproc.service @@ -0,0 +1,13 @@ +[Unit] +Description=LCDproc system status information viewer on %I +Documentation=man:lcdproc(8) http://www.lcdproc.org/ +After=vyos-router.service LCDd.service +Requires=LCDd.service + +[Service] +User=root +ExecStart=/usr/bin/lcdproc -f -c /run/lcdproc/lcdproc.conf +PIDFile=/run/lcdproc/lcdproc.pid + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3