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

---
 src/conf_mode/system_lcd.py | 4 ++++
 src/systemd/lcdproc.service | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

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