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

detect whether cgmanager_list_controllers is available

Browse Source 
and don't use it if not. This fixes failure to build with older
cgmanager.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Serge Hallyn 2015-06-03 05:03:39 +00:00 committed by Stéphane Graber
parent 454ec0abc7
commit a041127564
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -284,6 +284,17 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_MSG_CHECKING(for cgmanager_list_controllers)
save_LIBS=$LIBS
AC_SEARCH_LIBS([cgmanager_list_controllers_sync], [cgmanager], [have_list_controllers=yes], [have_list_controllers=no], [-lnih -lnih-dbus -ldbus-1])
LIBS=$save_LIBS
if test "x$have_list_controllers" = "xyes"; then
AC_DEFINE([HAVE_CGMANAGER_LIST_CONTROLLERS], 1, [Have cgmanager_list_controllers])
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
# Check for static libcap, make sure the function checked for differs from the # Check for static libcap, make sure the function checked for differs from the
# the one checked below so the cache doesn't give a wrong answer # the one checked below so the cache doesn't give a wrong answer
OLD_CFLAGS="$CFLAGS" OLD_CFLAGS="$CFLAGS"

7
src/lxc/cgmanager.c
View File

@ -818,6 +818,7 @@ out:
return pids_len; return pids_len;
} }
#if HAVE_CGMANAGER_LIST_CONTROLLERS
static bool lxc_list_controllers(char ***list) static bool lxc_list_controllers(char ***list)
{ {
if (!cgm_dbus_connect()) { if (!cgm_dbus_connect()) {
@ -836,6 +837,12 @@ static bool lxc_list_controllers(char ***list)
cgm_dbus_disconnect(); cgm_dbus_disconnect();
return true; return true;
} }
#else
static bool lxc_list_controllers(char ***list)
{
return false;
}
#endif
static inline void free_abs_cgroup(char *cgroup) static inline void free_abs_cgroup(char *cgroup)
{ {