4 files changed, 63 insertions, 20 deletions

diff --git a/src/vlib/unix/cli.c b/src/vlib/unix/cli.c
index 1befa25def4..068a4e169dc 100644
--- a/src/vlib/unix/cli.c
+++ b/src/vlib/unix/cli.c
@@ -2642,15 +2642,19 @@ unix_cli_config (vlib_main_t * vm, unformat_input_t * input)
       /* CLI listen. */
       unix_file_t template = { 0 };
 
-      /* If our listen address looks like a path and it starts with
-       * VPP_RUN_DIR, go make sure VPP_RUN_DIR exists before trying to open
-       * a socket in it.
-       */
-      if (strncmp (s->config, VPP_RUN_DIR "/", strlen (VPP_RUN_DIR) + 1) == 0)
+      /* mkdir of file socketu, only under /run  */
+      if (strncmp (s->config, "/run", 4) == 0)
 	{
-	  error = unix_make_vpp_run_dir ();
-	  if (error)
-	    return error;
+	  u8 *tmp = format (0, "%s", s->config);
+	  int i = vec_len (tmp);
+	  while (i && tmp[--i] != '/')
+	    ;
+
+	  tmp[i] = 0;
+
+	  if (i)
+	    vlib_unix_recursive_mkdir ((char *) tmp);
+	  vec_free (tmp);
 	}
 
       s->flags = SOCKET_IS_SERVER |	/* listen, don't connect */
diff --git a/src/vlib/unix/main.c b/src/vlib/unix/main.c
index ad1a7c3ccda..cb34a89f87a 100644
--- a/src/vlib/unix/main.c
+++ b/src/vlib/unix/main.c
@@ -56,6 +56,8 @@
 /** Default CLI history depth if not configured in startup.conf */
 #define UNIX_CLI_DEFAULT_HISTORY 50
 
+char *vlib_default_runtime_dir __attribute__ ((weak));
+char *vlib_default_runtime_dir = "/run/vlib";
 
 unix_main_t unix_main;
 
@@ -332,6 +334,8 @@ unix_config (vlib_main_t * vm, unformat_input_t * input)
       else
 	if (unformat (input, "cli-listen %s", &um->cli_listen_socket.config))
 	;
+      else if (unformat (input, "runtime-dir %s", &um->runtime_dir))
+	;
       else if (unformat (input, "cli-line-mode"))
 	um->cli_line_mode = 1;
       else if (unformat (input, "cli-no-banner"))
@@ -432,6 +436,9 @@ unix_config (vlib_main_t * vm, unformat_input_t * input)
     }
   um->unix_config_complete = 1;
 
+  if (um->runtime_dir == 0)
+    um->runtime_dir = format (0, "%s%c", vlib_default_runtime_dir, 0);
+
   return 0;
 }
 
@@ -463,6 +470,10 @@ unix_config (vlib_main_t * vm, unformat_input_t * input)
  * Ask the Linux kernel to dump all memory-mapped address regions, instead
  * of just text+data+bss.
  *
+ * @cfgcmd{runtime-dir}
+ * Define directory where VPP is going to store all runtime files.
+ * Default is /run/vpp.
+ *
  * @cfgcmd{cli-listen, <address:port>}
  * Bind the CLI to listen at the address and port given. @clocalhost
  * on TCP port @c 5002, given as <tt>cli-listen localhost:5002</tt>,
@@ -489,7 +500,7 @@ unix_config (vlib_main_t * vm, unformat_input_t * input)
  * Limit pager buffer to @c nn lines of output.
  * A value of @c 0 disables the pager. Default value: @c 100000
 ?*/
-VLIB_CONFIG_FUNCTION (unix_config, "unix");
+VLIB_EARLY_CONFIG_FUNCTION (unix_config, "unix");
 
 static clib_error_t *
 unix_exit (vlib_main_t * vm)
diff --git a/src/vlib/unix/unix.h b/src/vlib/unix/unix.h
index ffa92bba1dc..ee1312e3498 100644
--- a/src/vlib/unix/unix.h
+++ b/src/vlib/unix/unix.h
@@ -44,9 +44,6 @@
 #include <termios.h>
 
 
-/** VPP runtime ephemeral directory. Typically stored in a tmpfs. */
-#define VPP_RUN_DIR "/run/vpp"
-
 struct unix_file;
 typedef clib_error_t *(unix_file_function_t) (struct unix_file * f);
 
@@ -106,6 +103,9 @@ typedef struct
   /* startup-config filename */
   u8 *startup_config_filename;
 
+  /* runtime directory path */
+  u8 *runtime_dir;
+
   /* unix config complete */
   volatile int unix_config_complete;
 
@@ -214,6 +214,12 @@ vlib_unix_get_main (void)
   return &unix_main;
 }
 
+static inline char *
+vlib_unix_get_runtime_dir (void)
+{
+  return (char *) unix_main.runtime_dir;
+}
+
 /* thread stack array; vec_len = max number of threads */
 extern u8 **vlib_thread_stacks;
 
@@ -233,7 +239,7 @@ clib_error_t *foreach_directory_file (char *dir_name,
 							   u8 * file_name),
 				      void *arg, int scan_dirs);
 
-clib_error_t *unix_make_vpp_run_dir (void);
+clib_error_t *vlib_unix_recursive_mkdir (char *path);
 
 #endif /* included_unix_unix_h */
 
diff --git a/src/vlib/unix/util.c b/src/vlib/unix/util.c
index 51b4a4ed9b1..93aeb99c5d9 100644
--- a/src/vlib/unix/util.c
+++ b/src/vlib/unix/util.c
@@ -223,16 +223,38 @@ done:
 }
 
 clib_error_t *
-unix_make_vpp_run_dir (void)
+vlib_unix_recursive_mkdir (char *path)
 {
-  int rv;
+  clib_error_t *error = 0;
+  char *c = 0;
+  int i = 0;
 
-  rv = mkdir (VPP_RUN_DIR, 0755);
-  if (rv && errno != EEXIST)
-    return clib_error_return (0, "mkdir '%s' failed errno %d",
-			      VPP_RUN_DIR, errno);
+  while (path[i] != 0)
+    {
+      if (c && path[i] == '/')
+	{
+	  vec_add1 (c, 0);
+	  if ((mkdir (c, 0755)) && (errno != EEXIST))
+	    {
+	      error = clib_error_return_unix (0, "mkdir '%s'", c);
+	      goto done;
+	    }
+	  _vec_len (c)--;
+	}
+      vec_add1 (c, path[i]);
+      i++;
+    }
 
-  return 0;
+  if ((mkdir (path, 0755)) && (errno != EEXIST))
+    {
+      error = clib_error_return_unix (0, "mkdir '%s'", path);
+      goto done;
+    }
+
+done:
+  vec_free (c);
+
+  return error;
 }
 
 /*