From 38c6474a926c9e1db170329a6fd738cb43eb8d4a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 15 Sep 2018 12:02:24 +0200
Subject: [PATCH] net/vnstat: small tweaks

Use "sleep 1" because start / restart returns fast without
the PID file being up in time.
---
 .../mvc/app/controllers/OPNsense/Vnstat/forms/general.xml     | 4 ++--
 .../src/opnsense/mvc/app/models/OPNsense/Vnstat/Menu/Menu.xml | 2 +-
 net/vnstat/src/opnsense/scripts/OPNsense/Vnstat/setup.sh      | 3 +--
 .../src/opnsense/service/conf/actions.d/actions_vnstat.conf   | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/forms/general.xml b/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/forms/general.xml
index dd8a6c910..6fe12c58e 100644
--- a/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/forms/general.xml
+++ b/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/forms/general.xml
@@ -1,9 +1,9 @@
 <form>
     <field>
         <id>general.enabled</id>
-        <label>Enable vnstat daemon</label>
+        <label>Enable vnStat daemon</label>
         <type>checkbox</type>
-        <help>This will activate the vnstat daemon.</help>
+        <help>This will activate the vnStat daemon.</help>
     </field>
     <field>
         <id>general.interface</id>
diff --git a/net/vnstat/src/opnsense/mvc/app/models/OPNsense/Vnstat/Menu/Menu.xml b/net/vnstat/src/opnsense/mvc/app/models/OPNsense/Vnstat/Menu/Menu.xml
index 1dcdcdf69..8c059d7a5 100644
--- a/net/vnstat/src/opnsense/mvc/app/models/OPNsense/Vnstat/Menu/Menu.xml
+++ b/net/vnstat/src/opnsense/mvc/app/models/OPNsense/Vnstat/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
   <Services>
-    <Vnstat cssClass="fa fa-bar-chart" url="/ui/vnstat/general/index" />
+    <VnStat cssClass="fa fa-bar-chart" url="/ui/vnstat/general/index" />
   </Services>
 </menu>
diff --git a/net/vnstat/src/opnsense/scripts/OPNsense/Vnstat/setup.sh b/net/vnstat/src/opnsense/scripts/OPNsense/Vnstat/setup.sh
index 21d58dae6..f7eccc595 100755
--- a/net/vnstat/src/opnsense/scripts/OPNsense/Vnstat/setup.sh
+++ b/net/vnstat/src/opnsense/scripts/OPNsense/Vnstat/setup.sh
@@ -6,5 +6,4 @@ chmod 755 /var/run/vnstat
 
 mkdir -p /var/lib/vnstat
 chown -R vnstat:vnstat /var/lib/vnstat
-chmod 755 /var/lib/
-chmod -R 755 /var/lib/vnstat
+chmod 755 /var/lib/vnstat /var/lib
diff --git a/net/vnstat/src/opnsense/service/conf/actions.d/actions_vnstat.conf b/net/vnstat/src/opnsense/service/conf/actions.d/actions_vnstat.conf
index 60d04b96b..03d9ee278 100644
--- a/net/vnstat/src/opnsense/service/conf/actions.d/actions_vnstat.conf
+++ b/net/vnstat/src/opnsense/service/conf/actions.d/actions_vnstat.conf
@@ -1,5 +1,5 @@
 [start]
-command:/usr/local/opnsense/scripts/OPNsense/Vnstat/setup.sh;/usr/local/etc/rc.d/vnstat start
+command:/usr/local/opnsense/scripts/OPNsense/Vnstat/setup.sh;/usr/local/etc/rc.d/vnstat start && sleep 1
 parameters:
 type:script
 message:starting Vnstat
@@ -11,7 +11,7 @@ type:script
 message:stopping Vnstat
 
 [restart]
-command:/usr/local/opnsense/scripts/OPNsense/Vnstat/setup.sh;/usr/local/etc/rc.d/vnstat restart
+command:/usr/local/opnsense/scripts/OPNsense/Vnstat/setup.sh;/usr/local/etc/rc.d/vnstat restart && sleep 1
 parameters:
 type:script
 message:restarting Vnstat