diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-05-28 17:36:40 +0800 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-05-28 17:36:40 +0800 |
| commit | d2edfae0f9bdbecf6a8518e2a5bcf06f470e0d9e (patch) | |
| tree | 10cddc44db05b62c3d57b9b741eef95eef001aae /src/core | |
| parent | c9679c652b3c31f2510e8805d81630680ebc7e95 (diff) | |
build-sys: use glibc's xattr support instead of requiring libattr
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/mount-setup.c | 2 | ||||
| -rw-r--r-- | src/core/socket.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index 34d71e5b4..ae8447ca4 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -93,10 +93,8 @@ static const MountPoint mount_table[] = { NULL, MNT_FATAL|MNT_IN_CONTAINER }, { "tmpfs", "/sys/fs/cgroup", "tmpfs", "mode=755", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_STRICTATIME, NULL, MNT_FATAL|MNT_IN_CONTAINER }, -#ifdef HAVE_XATTR { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd,xattr", MS_NOSUID|MS_NOEXEC|MS_NODEV, NULL, MNT_FATAL|MNT_IN_CONTAINER }, -#endif { "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, NULL, MNT_FATAL|MNT_IN_CONTAINER }, { "pstore", "/sys/fs/pstore", "pstore", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, diff --git a/src/core/socket.c b/src/core/socket.c index aca20fd10..60dc9d0cd 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -29,9 +29,7 @@ #include <arpa/inet.h> #include <netinet/tcp.h> #include <mqueue.h> -#ifdef HAVE_XATTR -#include <attr/xattr.h> -#endif +#include <sys/xattr.h> #include "sd-event.h" #include "log.h" |