diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-08-18 16:40:51 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-08-18 16:40:51 +0200 |
| commit | b1675e420479cd6b582c66c0902d6e326340658f (patch) | |
| tree | 04bb06f117850da675f7678be6b80ecc2e522a6f /src | |
| parent | b9658cf8fa85d5d2bdc503d10340dc82c9c2a8c0 (diff) | |
| download | vyos-1x-b1675e420479cd6b582c66c0902d6e326340658f.tar.gz vyos-1x-b1675e420479cd6b582c66c0902d6e326340658f.zip | |
lcd: T2564: add support for Lanner, Watchguard, Symantec boxes
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/system_lcd.py | 4 | ||||
| -rw-r--r-- | src/systemd/lcdproc.service | 4 |
2 files changed, 6 insertions, 2 deletions
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 |