[oe-commits] [meta-openembedded] 31/45: openvpn: openvpn-volatile.conf: avoid hardcoded localstatedir

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 3599a723fc66de36f8bb7b4417396dc2fea8da9a
Author: Andrea Galbusera <gizero at gmail.com>
AuthorDate: Wed Apr 12 15:25:58 2017 +0200

    openvpn: openvpn-volatile.conf: avoid hardcoded localstatedir
    
    Signed-off-by: Andrea Galbusera <gizero at gmail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf | 2 +-
 meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf b/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf
index 4a3dc4a..1205806 100644
--- a/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf
+++ b/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf
@@ -1 +1 @@
-d /var/run/openvpn 0755 root root -
+d @LOCALSTATEDIR@/run/openvpn 0755 root root -
diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb b/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb
index 8dd4566..8892a9e 100644
--- a/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb
+++ b/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb
@@ -50,6 +50,7 @@ do_install_append() {
 
         install -d ${D}${sysconfdir}/tmpfiles.d
         install -m 0644 ${WORKDIR}/openvpn-volatile.conf ${D}${sysconfdir}/tmpfiles.d/openvpn.conf
+        sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/tmpfiles.d/openvpn.conf
     fi
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.