From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Fri, 20 Mar 2009 15:25:46 +0000 (+0100)
Subject: Fix capability setting for lxc-init
X-Git-Tag: lxc_0_6_1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfdcea5c4f98285f25000a899992b4698c97388b;p=thirdparty%2Flxc.git

Fix capability setting for lxc-init

lxc-init has moved to libexec, change the corresponding setcap
path.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 3f0c1d75a..28b7ac4b4 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -128,6 +128,9 @@ lxc_restart_LDADD = liblxc.la
 lxc_version_SOURCES = lxc_version.c
 lxc_version_LDADD = liblxc.la
 
+install-libexecPROGRAMS:
+	 setcap cap_sys_admin=ep $(libexecdir)/lxc-init
+
 install-exec-local:
 	-@export PATH=$$PATH:/sbin:/usr/sbin && \
 	 mkdir -p $(localstatedir) && \
@@ -146,9 +149,6 @@ install-exec-local:
 	 setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
 		$(bindir)/lxc-unshare && \
 		\
-	 setcap cap_sys_admin=ep \
-		$(bindir)/lxc-init && \
-		\
 	 setcap cap_sys_admin=ep \
 		$(bindir)/lxc-netstat && \
 		\