[lxc-devel] [lxc/master] bionic: s/lxc_raw_execveat()/execveat()/g

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200518/4a70e0b2/attachment.bin>
-------------- next part --------------
From b164903bcd105177fdccdc16bf32767a9aeb272c Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Mon, 18 May 2020 20:02:37 +0200
Subject: [PATCH] bionic: s/lxc_raw_execveat()/execveat()/g

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 src/include/fexecve.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/include/fexecve.c b/src/include/fexecve.c
index 0627cc802d..40d2b5b46d 100644
--- a/src/include/fexecve.c
+++ b/src/include/fexecve.c
@@ -41,11 +41,9 @@ int fexecve(int fd, char *const argv[], char *const envp[])
 		return -1;
 	}
 
-#ifdef __NR_execveat
-	lxc_raw_execveat(fd, "", argv, envp, AT_EMPTY_PATH);
+	execveat(fd, "", argv, envp, AT_EMPTY_PATH);
 	if (errno != ENOSYS)
 		return -1;
-#endif
 
 	ret = snprintf(procfd, sizeof(procfd), "/proc/self/fd/%d", fd);
 	if (ret < 0 || (size_t)ret >= sizeof(procfd)) {