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

syscall_wrappers: move setns()

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-10-03 12:57:32 +02:00
parent 6a886ddf19
commit 59524108dd
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
7 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lxc/Makefile.am
View File

@ -360,7 +360,8 @@ lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \
log.c log.h \
network.c network.h \
parse.c parse.h \
raw_syscalls.c raw_syscalls.h
raw_syscalls.c raw_syscalls.h \
syscall_wrappers.h
lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \
conf.c conf.h \
list.h \

1
src/lxc/attach.c
View File

@ -60,6 +60,7 @@
#include "mainloop.h"
#include "namespace.h"
#include "raw_syscalls.h"
#include "syscall_wrappers.h"
#include "terminal.h"
#include "utils.h"

1
src/lxc/cmd/lxc_user_nic.c
View File

@ -52,6 +52,7 @@
#include "network.h"
#include "parse.h"
#include "raw_syscalls.h"
#include "syscall_wrappers.h"
#include "utils.h"
#ifndef HAVE_STRLCPY

1
src/lxc/network.c
View File

@ -57,6 +57,7 @@
#include "network.h"
#include "nl.h"
#include "raw_syscalls.h"
#include "syscall_wrappers.h"
#include "utils.h"
#ifndef HAVE_STRLCPY

1
src/lxc/start.c
View File

@ -75,6 +75,7 @@
#include "storage/storage.h"
#include "storage/storage_utils.h"
#include "sync.h"
#include "syscall_wrappers.h"
#include "terminal.h"
#include "utils.h"

32
src/lxc/syscall_wrappers.h
View File

@ -25,6 +25,7 @@
#endif
#include <asm/unistd.h>
#include <linux/keyctl.h>
#include <sched.h>
#include <stdint.h>
#include <sys/syscall.h>
#include <sys/types.h>
@ -110,4 +111,35 @@ static int pivot_root(const char *new_root, const char *put_old)
extern int pivot_root(const char *new_root, const char *put_old);
#endif
#if !defined(__NR_setns) && !defined(__NR_set_ns)
#if defined(__x86_64__)
#define __NR_setns 308
#elif defined(__i386__)
#define __NR_setns 346
#elif defined(__arm__)
#define __NR_setns 375
#elif defined(__aarch64__)
#define __NR_setns 375
#elif defined(__powerpc__)
#define __NR_setns 350
#elif defined(__s390__)
#define __NR_setns 339
#endif
#endif
/* Define setns() if missing from the C library */
#ifndef HAVE_SETNS
static inline int setns(int fd, int nstype)
{
#ifdef __NR_setns
return syscall(__NR_setns, fd, nstype);
#elif defined(__NR_set_ns)
return syscall(__NR_set_ns, fd, nstype);
#else
errno = ENOSYS;
return -1;
#endif
}
#endif
#endif /* __LXC_SYSCALL_WRAPPER_H */

31
src/lxc/utils.h
View File

@ -56,37 +56,6 @@ extern char *get_rundir(void);
#endif
#endif
#if !defined(__NR_setns) && !defined(__NR_set_ns)
#if defined(__x86_64__)
#define __NR_setns 308
#elif defined(__i386__)
#define __NR_setns 346
#elif defined(__arm__)
#define __NR_setns 375
#elif defined(__aarch64__)
#define __NR_setns 375
#elif defined(__powerpc__)
#define __NR_setns 350
#elif defined(__s390__)
#define __NR_setns 339
#endif
#endif
/* Define setns() if missing from the C library */
#ifndef HAVE_SETNS
static inline int setns(int fd, int nstype)
{
#ifdef __NR_setns
return syscall(__NR_setns, fd, nstype);
#elif defined(__NR_set_ns)
return syscall(__NR_set_ns, fd, nstype);
#else
errno = ENOSYS;
return -1;
#endif
}
#endif
/* Define sethostname() if missing from the C library */
#ifndef HAVE_SETHOSTNAME
static inline int sethostname(const char *name, size_t len)