Merge branch 'set-ld-cache-path' into 'main'

Fix bug when running host ldconfig using glibc compiled with a non-standard prefix

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

Author: Evan Lezar

pkg/deb/changelog

@@ -1,8 +1,9 @@
 libnvidia-container (1.10.0~rc.2-1) experimental; urgency=medium
 
   * Bump libtirpc to 1.3.2
+  * Fix bug when running host ldconfig using glibc compiled with a non-standard prefix
 
- -- NVIDIA CORPORATION <[email protected]>  Tue, 10 May 2022 16:04:54 +0200
+ -- NVIDIA CORPORATION <[email protected]>  Wed, 11 May 2022 07:21:08 +0200
 
 libnvidia-container (1.10.0~rc.1-1) experimental; urgency=medium
 

pkg/rpm/SPECS/libnvidia-container.spec

@@ -99,8 +99,9 @@ This package contains command-line tools that facilitate using the library.
 %{_bindir}/*
 
 %changelog
-* Tue May 10 2022 NVIDIA CORPORATION <[email protected]> 1.10.0-0.1.rc.2
+* Wed May 11 2022 NVIDIA CORPORATION <[email protected]> 1.10.0-0.1.rc.2
 - Bump libtirpc to 1.3.2
+- Fix bug when running host ldconfig using glibc compiled with a non-standard prefix
 
 * Thu Mar 24 2022 NVIDIA CORPORATION <[email protected]> 1.10.0-0.1.rc.1
 - [WSL2] Fix segmentation fault on WSL2s system with no adpaters present (e.g. /dev/dxg missing)

src/nvc_ldcache.c

@@ -359,7 +359,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt)
         if (validate_args(ctx, cnt != NULL) < 0)
                 return (-1);
 
-        argv = (char * []){cnt->cfg.ldconfig, cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
+        argv = (char * []){cnt->cfg.ldconfig, "-f", "/etc/ld.so.conf", "-C", "/etc/ld.so.cache", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
         if (*argv[0] == '@') {
                 /*
                  * We treat this path specially to be relative to the host filesystem.