Merge pull request #1505 from jfroy/propagate-driver-root

Pass driver root to nvinfo.New in device plugin main

Signed-off-by: Karthik Vetrivel <[email protected]>

Author: elezar

.github/scripts/backport.js

@@ -70,7 +70,7 @@ for (const targetBranch of branches) {
       const commitMessage = commit.commit.message.split('\n')[0];
       core.info(`Cherry-picking commit ${i + 1}/${commits.length}: ${commitSha.substring(0, 7)} - ${commitMessage}`);
       try {
-        execSync(`git cherry-pick -x ${commitSha}`, { 
+        execSync(`git cherry-pick -m 1 -x ${commitSha}`, { 
           encoding: 'utf-8',
           stdio: 'pipe'
         });

cmd/nvidia-device-plugin/main.go

@@ -338,6 +338,7 @@ func startPlugins(c *cli.Context, o *options) ([]plugin.Interface, bool, error)
 	)
 	devicelib := device.New(nvmllib)
 	infolib := nvinfo.New(
+		nvinfo.WithRoot(string(driverRoot)),
 		nvinfo.WithNvmlLib(nvmllib),
 		nvinfo.WithDeviceLib(devicelib),
 	)