Merge commit from fork

Add no-cntlibs CLI option to nvidia-container-cli

Author: elezar

src/cli/configure.c

@@ -36,6 +36,7 @@ const struct argp configure_usage = {
                 {"no-persistenced", 0x86, NULL, 0, "Don't include the NVIDIA persistenced socket", -1},
                 {"no-fabricmanager", 0x87, NULL, 0, "Don't include the NVIDIA fabricmanager socket", -1},
                 {"no-gsp-firmware", 0x88, NULL, 0, "Don't include GSP Firmware", -1},
+                {"no-cntlibs", 0x89, NULL, 0, "Don't overwrite host mounts with CUDA compat libs from the container", -1},
                 {0},
         },
         configure_parser,
@@ -165,6 +166,10 @@ configure_parser(int key, char *arg, struct argp_state *state)
                 if (str_join(&err, &ctx->driver_opts, "no-gsp-firmware", " ") < 0)
                         goto fatal;
                 break;
+        case 0x89:
+                if (str_join(&err, &ctx->container_flags, "no-cntlibs", " ") < 0)
+                        goto fatal;
+                break;
         case ARGP_KEY_ARG:
                 if (state->arg_num > 0)
                         argp_usage(state);

src/cli/list.c

@@ -25,6 +25,7 @@ const struct argp list_usage = {
                 {"no-persistenced", 0x84, NULL, 0, "Don't include the NVIDIA persistenced socket", -1},
                 {"no-fabricmanager", 0x85, NULL, 0, "Don't include the NVIDIA fabricmanager socket", -1},
                 {"no-gsp-firmware", 0x86, NULL, 0, "Don't include GSP Firmware", -1},
+                {"no-cntlibs", 0x87, NULL, 0, "Don't overwrite host mounts with CUDA compat libs from the container", -1},
                 {0},
         },
         list_parser,
@@ -86,6 +87,10 @@ list_parser(int key, char *arg, struct argp_state *state)
                         goto fatal;
                 ctx->list_firmwares = false;
                 break;
+        case 0x87:
+                if (str_join(&err, &ctx->container_flags, "no-cntlibs", " ") < 0)
+                        goto fatal;
+                break;
         case ARGP_KEY_END:
                 if (state->argc == 1 || (state->argc == 2 && ctx->imex_channels != NULL)) {
                         if ((ctx->devices = xstrdup(&err, "all")) == NULL)

src/nvc_container.c

@@ -21,7 +21,7 @@
 #include "xfuncs.h"
 
 static char *find_namespace_path(struct error *, const struct nvc_container *, const char *);
-static int  find_library_paths(struct error *, struct nvc_container *);
+static int  find_compat_library_paths(struct error *, struct nvc_container *);
 static int  lookup_owner(struct error *, struct nvc_container *);
 static int  copy_config(struct error *, struct nvc_container *, const struct nvc_container_config *);
 
@@ -58,7 +58,7 @@ find_namespace_path(struct error *err, const struct nvc_container *cnt, const ch
 }
 
 static int
-find_library_paths(struct error *err, struct nvc_container *cnt)
+find_compat_library_paths(struct error *err, struct nvc_container *cnt)
 {
         char path[PATH_MAX];
         glob_t gl;
@@ -247,7 +247,7 @@ nvc_container_new(struct nvc_context *ctx, const struct nvc_container_config *cf
         if (lookup_owner(&ctx->err, cnt) < 0)
                 goto fail;
         if (!(flags & OPT_NO_CNTLIBS)) {
-                if (find_library_paths(&ctx->err, cnt) < 0)
+                if (find_compat_library_paths(&ctx->err, cnt) < 0)
                         goto fail;
         }
         if ((cnt->mnt_ns = find_namespace_path(&ctx->err, cnt, "mnt")) == NULL)