github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-15 16:13:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2413 from nubificus/fix_jailed_fc-stable-2.1

Browse Source 
stable-2.1 | virtcontainers: fc: properly remove jailed block device
This commit is contained in:
Fabiano Fidêncio 2021-08-10 14:42:23 +02:00 committed by GitHub
commit d20ba7da17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime/virtcontainers/fc.go
View File

@ -1057,7 +1057,12 @@ func (fc *firecracker) hotplugBlockDevice(ctx context.Context, drive config.Bloc
fc.umountResource(driveID) fc.umountResource(driveID)
// use previous raw file created at createDiskPool, that way // use previous raw file created at createDiskPool, that way
// the resource is released by firecracker and it can be destroyed in the host // the resource is released by firecracker and it can be destroyed in the host
path = filepath.Join(fc.jailerRoot, driveID) if fc.jailed {
// use path relative to the jail
path = filepath.Join("/", driveID)
} else {
path = filepath.Join(fc.jailerRoot, driveID)
}
} }
return nil, fc.fcUpdateBlockDrive(ctx, path, driveID) return nil, fc.fcUpdateBlockDrive(ctx, path, driveID)