$(localstatedir) != $(prefix)/var

The current code assumes that localstatedir is equal to $(prefix)/var,
thus failing for example on debian, where prefix is /usr and
localstatedir is /var. This patch fixes this by expanding LXCPATH just
once in configure.ac to $(localstatedir)/lib/lxc and expanding that
variable everywhere else.

install-exec-local is changed to just do one mkdir -p, and taking into
account of the DESTDIR variable, user for example for packaging.

Changing the permission of LXCPATH is done in lxc-setcap

Signed-off-by: Guido Trotter <ultrotter@quaqua.net>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/configure.in b/configure.in
index 76c271c1dbbf5ac9a30800173604570cca9c0389..7e61280b61967ab56a9a2367353a40f259026bc4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,7 @@ AS_AC_EXPAND(BINDIR, $bindir)
 AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
+AS_AC_EXPAND(LXCPATH, "${localstatedir}/lib/lxc")
 
 AC_CHECK_HEADERS([linux/netlink.h linux/genetlink.h], [], AC_MSG_ERROR([netlink headers not found]),
 [#include <linux/types.h>

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 2100defd27b6ee2ea2913d9bb4bb2cb2bc858a05..fe974d216663b26ab36686638954553c0fa370e0 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= -I$(top_srcdir)/src -DLXCPATH="\"$(localstatedir)/lxc\"" \
+INCLUDES= -I$(top_srcdir)/src -DLXCPATH="\"@LXCPATH@\"" \
          -DLXCBINDIR="\"$(bindir)\"" \
          -DLXCLIBEXECDIR="\"$(libexecdir)\""
 AM_LDFLAGS= -lutil
@@ -132,5 +132,4 @@ lxc_version_SOURCES = lxc_version.c
 lxc_version_LDADD = liblxc.la
 
 install-exec-local:
-       @mkdir -p $(localstatedir) && mkdir -p $(prefix)/var/lxc && \
-       chmod ugo+rw $(prefix)/var/lxc
+       @mkdir -p $(DESTDIR)@LXCPATH@

diff --git a/src/lxc/lxc-ls.in b/src/lxc/lxc-ls.in
index 49722d16bbad7e37226a44ff8b3b8d63d28d9095..6a77ebef6eb6c087e1ec7e7ac4c8ec1814277816 100644 (file)
--- a/src/lxc/lxc-ls.in
+++ b/src/lxc/lxc-ls.in
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-lxcpath=@LOCALSTATEDIR@/lxc
+lxcpath=@LXCPATH@
 
 if [ ! -r $lxcpath ]; then
     exit 0

diff --git a/src/lxc/lxc-netstat.in b/src/lxc/lxc-netstat.in
index 072b4f4f44c05c27915de0df0fe4817443a93da2..901c3230f23523efa5f59d60a377b7f36c2cfe71 100644 (file)
--- a/src/lxc/lxc-netstat.in
+++ b/src/lxc/lxc-netstat.in
@@ -1,7 +1,7 @@
 #!/bin/bash
 # set -ex
 
-lxcpath=@LOCALSTATEDIR@/lxc
+lxcpath=@LXCPATH@
 exec=""
 
 if [ ! -r $lxcpath ]; then

diff --git a/src/lxc/lxc-ps.in b/src/lxc/lxc-ps.in
index efbafb234459c11d7153587e664b4ab899f76740..48a153fe7ce97c7d9b5fea51996f996e6a1e0765 100755 (executable)
--- a/src/lxc/lxc-ps.in
+++ b/src/lxc/lxc-ps.in
@@ -1,7 +1,7 @@
 #!/bin/bash
 # set -ex
 
-lxcpath=@LOCALSTATEDIR@/lxc
+lxcpath=@LXCPATH@
 
 if [ ! -r $lxcpath ]; then
     exit 0

diff --git a/src/lxc/lxc-setcap.in b/src/lxc/lxc-setcap.in
index df903bad88b723edfaef9cdcc1c34645172633a4..637b29f42adbf3a1a3665e4b39f646bd36302917 100644 (file)
--- a/src/lxc/lxc-setcap.in
+++ b/src/lxc/lxc-setcap.in
@@ -49,6 +49,7 @@ lxc_setcaps()
     setcap $LXC_UNSHARE_CAPS=ep @BINDIR@/lxc-unshare
     setcap $LXC_NETSTAT_CAPS=ep @BINDIR@/lxc-netstat
     setcap $LXC_INIT_CAPS=ep @LIBEXECDIR@/lxc-init
+    chmod 2777 @LXCPATH@
 }
 
 lxc_dropcaps()
@@ -60,6 +61,7 @@ lxc_dropcaps()
     setcap -r @BINDIR@/lxc-unshare
     setcap -r @BINDIR@/lxc-netstat
     setcap -r @LIBEXECDIR@/lxc-init
+    chmod 0755 @LXCPATH@
 }
 
 if [ "$(id -u)" != "0" ]; then