Merge pull request #2211 from tych0/usernsexec-init-log

usernsexec: init log fd
This commit is contained in:
Serge Hallyn 2018-03-12 11:31:46 -05:00 committed by GitHub
commit e3bc3b8645
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -53,6 +53,8 @@
#define MS_SLAVE (1 << 19) #define MS_SLAVE (1 << 19)
#endif #endif
extern int lxc_log_fd;
int unshare(int flags); int unshare(int flags);
static void usage(const char *name) static void usage(const char *name)
@ -274,6 +276,8 @@ int main(int argc, char *argv[])
int pipe1[2], /* child tells parent it has unshared */ int pipe1[2], /* child tells parent it has unshared */
pipe2[2]; /* parent tells child it is mapped and may proceed */ pipe2[2]; /* parent tells child it is mapped and may proceed */
lxc_log_fd = STDERR_FILENO;
memset(ttyname0, '\0', sizeof(ttyname0)); memset(ttyname0, '\0', sizeof(ttyname0));
memset(ttyname1, '\0', sizeof(ttyname1)); memset(ttyname1, '\0', sizeof(ttyname1));
memset(ttyname2, '\0', sizeof(ttyname2)); memset(ttyname2, '\0', sizeof(ttyname2));