diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-08-15 20:28:34 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-08-15 20:28:34 +0200 |
| commit | a8f5cc26273e561bb4d4df088f13e7b6023dad5e (patch) | |
| tree | 37a43b59ff7bf26331e552e89b803799391a26e8 /src/etc | |
| parent | 1e44607c15002e111bf65573207877cc87f13ab7 (diff) | |
| parent | b082a6fb211ef19d75c4c81414be9aa1b9248b45 (diff) | |
| download | vyos-1x-a8f5cc26273e561bb4d4df088f13e7b6023dad5e.tar.gz vyos-1x-a8f5cc26273e561bb4d4df088f13e7b6023dad5e.zip | |
Merge branch 't2564-lcd' of github.com:c-po/vyos-1x into current
* 't2564-lcd' of github.com:c-po/vyos-1x:
lcd: T2564: flatten CLI interface
system display: T2564: Added test model
system display: T2564: Dictionary code update
system display: T2564: Conf files to /run
system display: T2564: Changed "duration" to "time"
system display: T2564: py code cleanup
system display: T2564: Replace "config (enabled|disabled)" with "display disabled"
system display: T2564: Lowercase model names
system display: T2564 Extend VyOS to support appliance LCDs
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/systemd/system/LCDd.service.d/override.conf | 8 | ||||
| -rw-r--r-- | src/etc/systemd/system/hostapd@.service.d/override.conf | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/etc/systemd/system/LCDd.service.d/override.conf b/src/etc/systemd/system/LCDd.service.d/override.conf new file mode 100644 index 000000000..5f3f0dc95 --- /dev/null +++ b/src/etc/systemd/system/LCDd.service.d/override.conf @@ -0,0 +1,8 @@ +[Unit] +After= +After=vyos-router.service + +[Service] +ExecStart= +ExecStart=/usr/sbin/LCDd -c /run/LCDd/LCDd.conf + diff --git a/src/etc/systemd/system/hostapd@.service.d/override.conf b/src/etc/systemd/system/hostapd@.service.d/override.conf index bb8e81d7a..b03dbc299 100644 --- a/src/etc/systemd/system/hostapd@.service.d/override.conf +++ b/src/etc/systemd/system/hostapd@.service.d/override.conf @@ -3,8 +3,7 @@ After= After=vyos-router.service [Service] -WorkingDirectory=/run/hostapd -EnvironmentFile= +WorkingDirectory=/run/LCDd ExecStart= -ExecStart=/usr/sbin/hostapd -B -P /run/hostapd/%i.pid /run/hostapd/%i.conf -PIDFile=/run/hostapd/%i.pid +ExecStart=/usr/sbin/LCDd -s 1 -f -c /run/LCDd/LCDd.conf + |