system display: T2564: Conf files to /run

* src/conf_mode/system-display.py conf files to /run
+ src/systemd/LCDd@.service lo
- src/systemd/lcdproc.service
+ src/systemd/lcdproc@.service lo

4 files changed, 26 insertions, 16 deletions

diff --git a/src/conf_mode/system-display.py b/src/conf_mode/system-display.py
index 557b7cf6a..9ab35a331 100755
--- a/src/conf_mode/system-display.py
+++ b/src/conf_mode/system-display.py
@@ -34,9 +34,9 @@ def generate(config_dict):
     if not config_dict:
         return None
     # Render config file for daemon LCDd
-    render('/etc/LCDd.conf', 'system-display/LCDd.conf.tmpl', config_dict)
+    render('/run/LCDd/LCDd.lo.conf', 'system-display/LCDd.conf.tmpl', config_dict)
     # Render config file for client lcdproc
-    render('/etc/lcdproc.conf', 'system-display/lcdproc.conf.tmpl', config_dict)
+    render('/run/lcdproc/lcdproc.lo.conf', 'system-display/lcdproc.conf.tmpl', config_dict)
 
     return None
 
@@ -70,17 +70,17 @@ def verify(config_dict):
 
 def apply(config_dict):
     # Stop client
-    run('systemctl stop lcdproc.service')
+    run('systemctl stop lcdproc@lo.service')
 
     if not config_dict or 'disabled' in config_dict:
         # Stop server
-        run('systemctl stop LCDd.service')
+        run('systemctl stop LCDd@lo.service')
         return None
 
     # Restart server
-    run('systemctl restart LCDd.service')
+    run('systemctl restart LCDd@lo.service')
     # Start client
-    run('systemctl start lcdproc.service')
+    run('systemctl start lcdproc@lo.service')
 
     return None
 
diff --git a/src/systemd/LCDd@.service b/src/systemd/LCDd@.service
new file mode 100644
index 000000000..a4604cf21
--- /dev/null
+++ b/src/systemd/LCDd@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=LCD display daemon on %I
+Documentation=man:LCDd(8) http://www.lcdproc.org/
+
+[Service]
+User=root
+ExecStart=/usr/sbin/LCDd -s 1 -f -c /run/LCDd/LCDd.%I.conf
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/src/systemd/lcdproc.service b/src/systemd/lcdproc.service
deleted file mode 100644
index ea9178de9..000000000
--- a/src/systemd/lcdproc.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=LCDproc system status information viewer
-Documentation=man:lcdproc(8) http://www.lcdproc.org/
-
-[Service]
-User=root
-ExecStart=/usr/bin/lcdproc -f -c /etc/lcdproc.conf
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/src/systemd/lcdproc@.service b/src/systemd/lcdproc@.service
new file mode 100644
index 000000000..9a1723dba
--- /dev/null
+++ b/src/systemd/lcdproc@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=LCDproc system status information viewer on %I
+Documentation=man:lcdproc(8) http://www.lcdproc.org/
+
+[Service]
+User=root
+ExecStart=/usr/bin/lcdproc -f -c /run/lcdproc/lcdproc.%I.conf
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file