From e66da6046d0e8eef1d5eeb949579ba6dd843f88c Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 24 Oct 2017 18:28:53 -0400 Subject: [PATCH] Rename conmon argument to socket-dir-path Signed-off-by: Matthew Heon --- conmon/conmon.c | 2 +- oci/oci.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conmon/conmon.c b/conmon/conmon.c index 3fd14212..66d1bbe0 100644 --- a/conmon/conmon.c +++ b/conmon/conmon.c @@ -131,7 +131,7 @@ static GOptionEntry opt_entries[] = { "log-path", 'l', 0, G_OPTION_ARG_STRING, &opt_log_path, "Log file path", NULL }, { "timeout", 'T', 0, G_OPTION_ARG_INT, &opt_timeout, "Timeout in seconds", NULL }, { "log-size-max", 0, 0, G_OPTION_ARG_INT64, &opt_log_size_max, "Maximum size of log file", NULL }, - { "socket-path", 0, 0, G_OPTION_ARG_STRING, &opt_socket_path, "Location of container attach sockets", NULL }, + { "socket-dir-path", 0, 0, G_OPTION_ARG_STRING, &opt_socket_path, "Location of container attach sockets", NULL }, { NULL } }; diff --git a/oci/oci.go b/oci/oci.go index 73970c40..9ed8dcf3 100644 --- a/oci/oci.go +++ b/oci/oci.go @@ -179,7 +179,7 @@ func (r *Runtime) CreateContainer(c *Container, cgroupParent string) (err error) args = append(args, "-p", filepath.Join(c.bundlePath, "pidfile")) args = append(args, "-l", c.logPath) args = append(args, "--exit-dir", r.containerExitsDir) - args = append(args, "--socket-path", ContainerAttachSocketDir) + args = append(args, "--socket-dir-path", ContainerAttachSocketDir) if r.logSizeMax >= 0 { args = append(args, "--log-size-max", fmt.Sprintf("%v", r.logSizeMax)) } @@ -437,7 +437,7 @@ func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp args = append(args, fmt.Sprintf("%d", timeout)) } args = append(args, "-l", logPath) - args = append(args, "--socket-path", ContainerAttachSocketDir) + args = append(args, "--socket-dir-path", ContainerAttachSocketDir) pspec := rspec.Process{ Env: r.conmonEnv,