summaryrefslogtreecommitdiff
path: root/src/nspawn
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-05-07 19:03:46 +0200
committerLennart Poettering <lennart@poettering.net>2013-05-07 19:03:46 +0200
commitb00ad20fa0e490dde28e196739b4e18abb10e9b4 (patch)
tree75112d6b4fbda6efd998186d141087a39d06c0dd /src/nspawn
parent1210bc667d2d133814a0eb3cbcfcfb7e721fba9f (diff)
build-sys: support builds without EAs again
Diffstat (limited to 'src/nspawn')
-rw-r--r--src/nspawn/nspawn.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index f3568ab40c..a58cbec38a 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -22,7 +22,6 @@
#include <signal.h>
#include <sched.h>
#include <unistd.h>
-#include <attr/xattr.h>
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/mount.h>
@@ -43,6 +42,10 @@
#include <sys/un.h>
#include <sys/socket.h>
+#ifdef HAVE_XATTR
+#include <attr/xattr.h>
+#endif
+
#include <systemd/sd-daemon.h>
#include "log.h"
@@ -928,6 +931,7 @@ static int setup_cgroup(const char *path) {
}
static int save_attributes(const char *cgroup, pid_t pid, const char *uuid, const char *directory) {
+#ifdef HAVE_XATTR
_cleanup_free_ char *path = NULL;
char buf[DECIMAL_STR_MAX(pid_t)];
int r = 0, k;
@@ -936,7 +940,6 @@ static int save_attributes(const char *cgroup, pid_t pid, const char *uuid, cons
assert(pid >= 0);
assert(arg_directory);
-#ifdef HAVE_XATTR
assert_se(snprintf(buf, sizeof(buf), "%lu", (unsigned long) pid) < (int) sizeof(buf));
r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, cgroup, NULL, &path);
@@ -964,8 +967,10 @@ static int save_attributes(const char *cgroup, pid_t pid, const char *uuid, cons
if (r == 0)
r = k;
}
-#endif
return r;
+#else
+ return 0;
+#endif
}
static int drop_capabilities(void) {