vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add default CRI-O socket path back to conmon

Browse source 
Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon 2017-10-24 10:28:25 -04:00
parent ae5fc471ea
commit 042f31fe68
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
conmon/conmon.c
View file

@ -96,6 +96,8 @@ static inline void strv_cleanup(char ***strv)
#define CMD_SIZE 1024 #define CMD_SIZE 1024
#define MAX_EVENTS 10 #define MAX_EVENTS 10
#define DEFAULT_SOCKET_PATH "/var/lib/crio"
static bool opt_terminal = false; static bool opt_terminal = false;
static bool opt_stdin = false; static bool opt_stdin = false;
static char *opt_cid = NULL; static char *opt_cid = NULL;
@ -111,7 +113,7 @@ static char *opt_log_path = NULL;
static char *opt_exit_dir = NULL; static char *opt_exit_dir = NULL;
static int opt_timeout = 0; static int opt_timeout = 0;
static int64_t opt_log_size_max = -1; static int64_t opt_log_size_max = -1;
static char *opt_socket_path = NULL; static char *opt_socket_path = DEFAULT_SOCKET_PATH;
static GOptionEntry opt_entries[] = static GOptionEntry opt_entries[] =
{ {
{ "terminal", 't', 0, G_OPTION_ARG_NONE, &opt_terminal, "Terminal", NULL }, { "terminal", 't', 0, G_OPTION_ARG_NONE, &opt_terminal, "Terminal", NULL },
@ -1159,9 +1161,6 @@ int main(int argc, char *argv[])
if (opt_log_path == NULL) if (opt_log_path == NULL)
nexit("Log file path not provided. Use --log-path"); nexit("Log file path not provided. Use --log-path");
if (opt_socket_path == NULL)
nexit("Socket path not provided. Use --socket-path");
start_pipe_fd = get_pipe_fd_from_env("_OCI_STARTPIPE"); start_pipe_fd = get_pipe_fd_from_env("_OCI_STARTPIPE");
if (start_pipe_fd >= 0) { if (start_pipe_fd >= 0) {
/* Block for an initial write to the start pipe before /* Block for an initial write to the start pipe before