move lxc-init to $libdir/lxc

As specified by FHS: /usr/lib includes object files, libraries, and internal binaries that are not intended to be executed directly by users or shell scripts. Applications may use a single subdirectory under /usr/lib. If an application uses a subdirectory, all architecture-dependent data exclusively used by the application must be placed within that subdirectory. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

move lxc-init to $libdir/lxc
d674be08 · Daniel Lezcano · Daniel Lezcano · baf6671f · d674be08 · d674be08
Commit d674be08 authored May 27, 2010 by Daniel Lezcano Committed by Daniel Lezcano May 27, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

configure.ac configure.ac +4 -3

Makefile.am src/lxc/Makefile.am +1 -1

lxc-setcap.in src/lxc/lxc-setcap.in +2 -2

lxc_execute.c src/lxc/lxc_execute.c +1 -1

No files found.
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,6 @@ AS_AC_EXPAND(PREFIX, $prefix)
 AS_AC_EXPAND(LIBDIR, $libdir)
 AS_AC_EXPAND(BINDIR, $bindir)
 AS_AC_EXPAND(INCLUDEDIR, $includedir)
-AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(DATADIR, $datadir)
 AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
@@ -54,13 +53,15 @@ AC_ARG_WITH([rootfs-path],
 	)], [], [with_rootfs_path="${libdir}/lxc/rootfs"])

 AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date)")
+
 AS_AC_EXPAND(LXCPATH, "${with_config_path}")
 AS_AC_EXPAND(LXCROOTFSMOUNT, "${with_rootfs_path}")
+AS_AC_EXPAND(LXCINITDIR, $libdir/lxc)
 AH_TEMPLATE([LXCPATH], [lxc configuration repository])
-AH_TEMPLATE([LXCLIBEXECDIR], [lxc executable library path])
+AH_TEMPLATE([LXCINITDIR], [lxc-init directory location])
 AH_TEMPLATE([LXCROOTFSMOUNT], [lxc default rootfs mount point])
 AC_DEFINE_UNQUOTED(LXCPATH, "$LXCPATH")
-AC_DEFINE_UNQUOTED(LXCLIBEXECDIR, "$LIBEXECDIR")
+AC_DEFINE_UNQUOTED(LXCINITDIR, "$LXCINITDIR")
 AC_DEFINE_UNQUOTED(LXCROOTFSMOUNT, "$LXCROOTFSMOUNT")

 AC_CHECK_HEADERS([linux/netlink.h linux/genetlink.h],

--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -86,7 +86,7 @@ bin_PROGRAMS = \
 	lxc-restart \
 	lxc-kill

-libexec_PROGRAMS = \
+pkglib_PROGRAMS = \
 	lxc-init

 AM_LDFLAGS=-Wl,-E -Wl,-rpath -Wl,$(libdir)

--- a/src/lxc/lxc-setcap.in
+++ b/src/lxc/lxc-setcap.in
@@ -52,7 +52,7 @@ lxc_setcaps()
    setcap $LXC_UNSHARE_CAPS=ep @BINDIR@/lxc-unshare
    setcap $LXC_NETSTAT_CAPS=ep @BINDIR@/lxc-netstat
    setcap $LXC_CHECKPOINT_CAPS=ep @BINDIR@/lxc-checkpoint
-    setcap $LXC_INIT_CAPS=ep @LIBEXECDIR@/lxc-init
+    setcap $LXC_INIT_CAPS=ep @LXCINITDIR@/lxc-init

    test -e @LXCPATH@ || mkdir -p @LXCPATH@
    chmod 0777 @LXCPATH@
@@ -67,7 +67,7 @@ lxc_dropcaps()
    setcap -r @BINDIR@/lxc-unshare
    setcap -r @BINDIR@/lxc-netstat
    setcap -r @BINDIR@/lxc-checkpoint
-    setcap -r @LIBEXECDIR@/lxc-init
+    setcap -r @LXCINITDIR@/lxc-init
    chmod 0755 @LXCPATH@
 }


--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
 			 my_args.progname, my_args.quiet))
 		return -1;

-	args = lxc_arguments_dup(LXCLIBEXECDIR "/lxc-init", &my_args);
+	args = lxc_arguments_dup(LXCINITDIR "/lxc-init", &my_args);
 	if (!args)
 		return -1;