github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-29 21:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Make relative paths in runtime mkdir be relative to container rootfs

Browse Source 
Currently all paths were treated as absolute paths.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2018-01-10 14:36:57 +00:00
parent a4a332f39a
commit ae64ab6b82
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/init/cmd/service/prepare.go
View File

@ -143,6 +143,7 @@ func prepareFilesystem(path string, runtime Runtime) error {
// execute the runtime config that should be done up front // execute the runtime config that should be done up front
// we execute Mounts before Mkdir so you can make a directory under a mount // we execute Mounts before Mkdir so you can make a directory under a mount
// but we do mkdir of the destination path in case missing // but we do mkdir of the destination path in case missing
rootfs := filepath.Join(path, "rootfs")
for _, mount := range runtime.Mounts { for _, mount := range runtime.Mounts {
const mode os.FileMode = 0755 const mode os.FileMode = 0755
err := os.MkdirAll(mount.Destination, mode) err := os.MkdirAll(mount.Destination, mode)
@ -167,6 +168,10 @@ func prepareFilesystem(path string, runtime Runtime) error {
for _, dir := range runtime.Mkdir { for _, dir := range runtime.Mkdir {
// in future we may need to change the structure to set mode, ownership // in future we may need to change the structure to set mode, ownership
const mode os.FileMode = 0755 const mode os.FileMode = 0755
// relative paths are relative to rootfs of container
if !filepath.IsAbs(dir) {
dir = filepath.Join(rootfs, dir)
}
err := os.MkdirAll(dir, mode) err := os.MkdirAll(dir, mode)
if err != nil { if err != nil {
return fmt.Errorf("Cannot create directory %s: %v", dir, err) return fmt.Errorf("Cannot create directory %s: %v", dir, err)