Skip to content

Commit ba558ef

Browse files
committed
Execution of cvd create by podcvd should use absolute path
1 parent 67ed8aa commit ba558ef

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

  • container/src/podcvd/internal

container/src/podcvd/internal/host.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,15 +270,23 @@ func createAndStartContainer(ccm CuttlefishContainerManager, cvdArgs *CvdArgs) (
270270
return "", fmt.Errorf("failed to create podcvd home dir: %w", err)
271271
}
272272
var pathsToMount []string
273-
for _, arg := range cvdArgs.SubCommandArgs {
273+
for idx, arg := range cvdArgs.SubCommandArgs {
274274
path := arg
275+
var flagPrefix string
275276
if strings.Contains(arg, "=") {
276-
path = strings.SplitN(arg, "=", 2)[1]
277+
parts := strings.SplitN(arg, "=", 2)
278+
flagPrefix = parts[0]
279+
path = parts[1]
277280
}
278281
absPath := resolveHostPath(path)
279282
if absPath == "" {
280283
continue
281284
}
285+
if flagPrefix != "" {
286+
cvdArgs.SubCommandArgs[idx] = flagPrefix + "=" + absPath
287+
} else {
288+
cvdArgs.SubCommandArgs[idx] = absPath
289+
}
282290
pathsToMount = append(pathsToMount, absPath)
283291
if realPath, err := filepath.EvalSymlinks(absPath); err == nil && realPath != absPath {
284292
pathsToMount = append(pathsToMount, realPath)

0 commit comments

Comments
 (0)