From b082a6fb211ef19d75c4c81414be9aa1b9248b45 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 13 Aug 2020 18:31:08 +0200
Subject: lcd: T2564: flatten CLI interface

* set system lcd device <device>
* set system lcd model <modeml>

Both device and model have completion helpers for supported interfaces and LCD
displays.
---
 src/systemd/lcdproc.service | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 src/systemd/lcdproc.service

(limited to 'src/systemd/lcdproc.service')

diff --git a/src/systemd/lcdproc.service b/src/systemd/lcdproc.service
new file mode 100644
index 000000000..5aa99ec78
--- /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
+After=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


From b1675e420479cd6b582c66c0902d6e326340658f Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 18 Aug 2020 16:40:51 +0200
Subject: lcd: T2564: add support for Lanner, Watchguard, Symantec boxes

---
 data/templates/lcd/LCDd.conf.tmpl       | 12 ++++++++++--
 interface-definitions/system-lcd.xml.in | 16 ++++++++++------
 src/conf_mode/system_lcd.py             |  4 ++++
 src/systemd/lcdproc.service             |  4 ++--
 4 files changed, 26 insertions(+), 10 deletions(-)

(limited to 'src/systemd/lcdproc.service')

diff --git a/data/templates/lcd/LCDd.conf.tmpl b/data/templates/lcd/LCDd.conf.tmpl
index da749d04a..bde177b6a 100644
--- a/data/templates/lcd/LCDd.conf.tmpl
+++ b/data/templates/lcd/LCDd.conf.tmpl
@@ -48,8 +48,12 @@ DriverPath=/usr/lib/x86_64-linux-gnu/lcdproc/
 #   sed1520, serialPOS, serialVFD, shuttleVFD, sli, stv5730, svga, t6963,
 #   text, tyan, ula200, vlsys_m428, xosd, yard2LCD
 
-{% if model is defined and model.startswith('CFA-') %}
+{% if model is defined %}
+{%   if model.startswith('cfa-') %}
 Driver=CFontzPacket
+{%   elif model == 'sdec' %}
+Driver=sdeclcd
+{%   endif %}
 {% endif %}
 
 # Tells the driver to bind to the given interface. [default: 127.0.0.1]
@@ -112,7 +116,7 @@ Heartbeat=off
 TitleSpeed=10
 
 {% if model is defined and model is not none %}
-{%   if model.startswith('CFA-') %}
+{%   if model.startswith('cfa-') %}
 ## CrystalFontz packet driver (for CFA533, CFA631, CFA633 & CFA635) ##
 [CFontzPacket]
 Model={{ model.split('-')[1] }}
@@ -122,5 +126,9 @@ Brightness=500
 OffBrightness=50
 Reboot=yes
 USB=yes
+{%   elif model == 'sdec' %}
+## SDEC driver for Lanner, Watchguard, Sophos sppliances ##
+[sdeclcd]
+# No options
 {%   endif %}
 {% endif %}
diff --git a/interface-definitions/system-lcd.xml.in b/interface-definitions/system-lcd.xml.in
index ad59acb6b..36116ae1b 100644
--- a/interface-definitions/system-lcd.xml.in
+++ b/interface-definitions/system-lcd.xml.in
@@ -12,26 +12,30 @@
             <properties>
               <help>Model of the display attached to this system [REQUIRED]</help>
               <completionHelp>
-                <list>CFA-533 CFA-631 CFA-633 CFA-635</list>
+                <list>cfa-533 cfa-631 cfa-633 cfa-635 sdec</list>
               </completionHelp>
               <valueHelp>
-                <format>CFA-533</format>
+                <format>cfa-533</format>
                 <description>Crystalfontz CFA-533</description>
               </valueHelp>
               <valueHelp>
-                <format>CFA-631</format>
+                <format>cfa-631</format>
                 <description>Crystalfontz CFA-631</description>
               </valueHelp>
               <valueHelp>
-                <format>CFA-633</format>
+                <format>cfa-633</format>
                 <description>Crystalfontz CFA-633</description>
               </valueHelp>
               <valueHelp>
-                <format>CFA-635</format>
+                <format>cfa-635</format>
                 <description>Crystalfontz CFA-635</description>
               </valueHelp>
+              <valueHelp>
+                <format>sdec</format>
+                <description>Lanner, Watchguard, Nexcom NSA, Sophos UTM appliances</description>
+              </valueHelp>
               <constraint>
-                <regex>^(CFA-533|CFA-631|CFA-633|CFA-635)$</regex>
+                <regex>^(cfa-533|cfa-631|cfa-633|cfa-635|sdec)$</regex>
               </constraint>
             </properties>
           </leafNode>
diff --git a/src/conf_mode/system_lcd.py b/src/conf_mode/system_lcd.py
index 0ad1318f0..31a09252d 100755
--- a/src/conf_mode/system_lcd.py
+++ b/src/conf_mode/system_lcd.py
@@ -41,6 +41,10 @@ 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!')
 
diff --git a/src/systemd/lcdproc.service b/src/systemd/lcdproc.service
index 5aa99ec78..ef717667a 100644
--- a/src/systemd/lcdproc.service
+++ b/src/systemd/lcdproc.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=LCDproc system status information viewer on %I
 Documentation=man:lcdproc(8) http://www.lcdproc.org/
-After=vyos-router.service
-After=LCDd.service
+After=vyos-router.service LCDd.service
+Requires=LCDd.service
 
 [Service]
 User=root
-- 
cgit v1.2.3