jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #416 from LK4D4/fix_mount_join 

Don't join rootfs if path already prefixed by it
This commit is contained in:
Mrunal Patel 2015-02-26 14:59:48 -08:00
parent bcfdee970e 087caf69e8
commit 0dee9793d5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rootfs_linux.go
View File

@ -7,6 +7,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strings"
"syscall" "syscall"
"time" "time"
@ -86,9 +87,13 @@ func setupRootfs(config *configs.Config, console *linuxConsole) (err error) {
func mount(m *configs.Mount, rootfs, mountLabel string) error { func mount(m *configs.Mount, rootfs, mountLabel string) error {
var ( var (
dest = filepath.Join(rootfs, m.Destination) dest = m.Destination
data = label.FormatMountLabel(m.Data, mountLabel) data = label.FormatMountLabel(m.Data, mountLabel)
) )
if !strings.HasPrefix(dest, rootfs) {
dest = filepath.Join(rootfs, dest)
}
switch m.Device { switch m.Device {
case "proc": case "proc":
if err := os.MkdirAll(dest, 0755); err != nil && !os.IsExist(err) { if err := os.MkdirAll(dest, 0755); err != nil && !os.IsExist(err) {