Merge branch 'custom-cli' into 'main'

Also change directory when not running pivot root See merge request nvidia/container-toolkit/libnvidia-container!175
NVIDIA · Jul 26, 2022 · ab4ac25 · ab4ac25
2 parents 78ae451 + fd323cb
commit ab4ac25
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/pkg/deb/changelog b/pkg/deb/changelog
@@ -1,6 +1,6 @@
 libnvidia-container (1.11.0~rc.2-1) experimental; urgency=medium
 
-  * Dummy entry
+  * Ensure that no-pivot-root option also updates LDCache
 
  -- NVIDIA CORPORATION <cudatools@nvidia.com>  Tue, 26 Jul 2022 14:59:03 +0200
 

diff --git a/pkg/rpm/SPECS/libnvidia-container.spec b/pkg/rpm/SPECS/libnvidia-container.spec
@@ -100,7 +100,7 @@ This package contains command-line tools that facilitate using the library.
 
 %changelog
 * Tue Jul 26 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.11.0-0.1.rc.2
-- Dummy entry
+- Ensure that no-pivot-root option also updates LDCache
 
 * Wed Jul 13 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.11.0-0.1.rc.1
 - Dummy entry

diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c
@@ -112,6 +112,14 @@ change_rootfs(struct error *err, const char *rootfs, bool no_pivot, bool mount_p
                 if (xmount(err, rootfs, "/", NULL, MS_MOVE, NULL) < 0) {
                         goto fail;
                 }
+                if ((newroot = xopen(err, rootfs, O_PATH|O_DIRECTORY)) < 0) {
+                        log_errf("failed calling xopen %s", rootfs);
+                        goto fail;
+                }
+                if (fchdir(newroot) < 0) {
+                        log_errf("failed calling fchdir %s", newroot);
+                        goto fail;
+                }
         } else {
                 if ((oldroot = xopen(err, "/", O_PATH|O_DIRECTORY)) < 0)
                         goto fail;