Merge branch 'upstream-bump-1.2.0-rc.3' into 'master'

Last Minute patch to WSL2 for 1.2.0-rc.3

See merge request nvidia/container-toolkit/libnvidia-container!33

Author: klueska

pkg/deb/changelog

@@ -1,11 +1,12 @@
 libnvidia-container (1.2.0~rc.3-1) experimental; urgency=medium
 
-  * 53739009d6 WSL2 Support - Fix error path when mounting the driver
-  * 38198a81cb WSL2 Support - Fix error path in dxcore
-  * 31f5ea3578 Changed email for travis.ci to [email protected]
-  * abdd51754b Update license and copyright in packages
-  * 65827fe7bc Update license clause to reflect actual licensing
-  * 77499d8884 Transition Travis CI build to Ubuntu 18.04
+  * 7deea6b8 WSL2 Support - Remove unnecessary umount and free
+  * 53739009 WSL2 Support - Fix error path when mounting the driver
+  * 38198a81 WSL2 Support - Fix error path in dxcore
+  * 31f5ea35 Changed email for travis.ci to [email protected]
+  * abdd5175 Update license and copyright in packages
+  * 65827fe7 Update license clause to reflect actual licensing
+  * 77499d88 Transition Travis CI build to Ubuntu 18.04
 
  -- NVIDIA CORPORATION <[email protected]>  Wed, 01 Jul 2020 14:24:59 -0700
 

pkg/rpm/SPECS/libnvidia-container.spec

@@ -100,12 +100,13 @@ This package contains command-line tools that facilitate using the library.
 
 %changelog
 * Wed Jul 01 2020 NVIDIA CORPORATION <[email protected]> 1.2.0-0.1.rc.3
-- 53739009d6 WSL2 Support - Fix error path when mounting the driver
-- 38198a81cb WSL2 Support - Fix error path in dxcore
-- 31f5ea3578 Changed email for travis.ci to [email protected]
-- abdd51754b Update license and copyright in packages
-- 65827fe7bc Update license clause to reflect actual licensing
-- 77499d8884 Transition Travis CI build to Ubuntu 18.04
+- 7deea6b8 WSL2 Support - Remove unnecessary umount and free
+- 53739009 WSL2 Support - Fix error path when mounting the driver
+- 38198a81 WSL2 Support - Fix error path in dxcore
+- 31f5ea35 Changed email for travis.ci to [email protected]
+- abdd5175 Update license and copyright in packages
+- 65827fe7 Update license clause to reflect actual licensing
+- 77499d88 Transition Travis CI build to Ubuntu 18.04
 
 * Thu Jun 18 2020 NVIDIA CORPORATION <[email protected]> 1.2.0-0.1.rc.2
 - 4ea9b59f Update debian based dockerfiles to set distribution in changelog

src/nvc_mount.c

@@ -565,13 +565,6 @@ device_mount_dxcore(struct nvc_context *ctx, const struct nvc_container *cnt)
                                                     drvstore_size)) == NULL)
         {
                 log_errf("failed to mount DriverStore libraries %s", ctx->dxcore.adapterList[0].pDriverStorePath);
-
-                for (size_t i = 0; i < drvstore_size; ++i)
-                        unmount(drvstore_mnt[i]);
-                array_free(drvstore_mnt, drvstore_size);
-
-                drvstore_size = 0;
-
                 return (-1);
         }