proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 14:40:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove HAVE_NEWUIDMAP and NEWUIDMAP

Browse Source 
Always build lxc-usernsexec.  Else we require having uidmap
installed on the build host for no good reason.  And we never
actually used the NEWUIDMAP path we detected.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Serge Hallyn 2013-11-21 22:11:43 -06:00
parent 94272b7104
commit 59328d58d3
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -64,10 +64,6 @@ AC_MSG_RESULT([$with_distro])
AM_CONDITIONAL([HAVE_DEBIAN], [test x"$with_distro" = "xdebian" -o x"$with_distro" = "xubuntu"]) AM_CONDITIONAL([HAVE_DEBIAN], [test x"$with_distro" = "xdebian" -o x"$with_distro" = "xubuntu"])
AM_CONDITIONAL([DISTRO_UBUNTU], [test "x$with_distro" = "xubuntu"]) AM_CONDITIONAL([DISTRO_UBUNTU], [test "x$with_distro" = "xubuntu"])
# Detect the newuidmap tool (required for userns)
AC_CHECK_PROG([NEWUIDMAP], [newuidmap], [newuidmap])
AM_CONDITIONAL([HAVE_NEWUIDMAP], [test -n "$NEWUIDMAP"])
# Allow disabling rpath # Allow disabling rpath
AC_ARG_ENABLE([rpath], AC_ARG_ENABLE([rpath],
[AC_HELP_STRING([--disable-rpath], [do not set rpath in executables])], [AC_HELP_STRING([--disable-rpath], [do not set rpath in executables])],

11
src/lxc/Makefile.am
View File

@ -124,10 +124,6 @@ if ENABLE_SELINUX
AM_CFLAGS += -DHAVE_SELINUX AM_CFLAGS += -DHAVE_SELINUX
endif endif
if HAVE_NEWUIDMAP
AM_CFLAGS += -DHAVE_NEWUIDMAP
endif
if USE_CONFIGPATH_LOGS if USE_CONFIGPATH_LOGS
AM_CFLAGS += -DUSE_CONFIGPATH_LOGS AM_CFLAGS += -DUSE_CONFIGPATH_LOGS
endif endif
@ -190,11 +186,8 @@ bin_PROGRAMS = \
lxc-destroy \ lxc-destroy \
lxc-create \ lxc-create \
lxc-user-nic \ lxc-user-nic \
lxc-snapshot lxc-snapshot \
lxc-usernsexec
if HAVE_NEWUIDMAP
bin_PROGRAMS += lxc-usernsexec
endif
pkglibexec_PROGRAMS = \ pkglibexec_PROGRAMS = \
lxc-init lxc-init