Selaa lähdekoodia

Merge pull request #3680 from pnasrat/extract-mount-pkg

Extract mount into pkg.
Michael Crosby 11 vuotta sitten
vanhempi
commit
0f0e582490

+ 1 - 1
cgroups/cgroups.go

@@ -3,7 +3,7 @@ package cgroups
 import (
 	"bufio"
 	"fmt"
-	"github.com/dotcloud/docker/mount"
+	"github.com/dotcloud/docker/pkg/mount"
 	"io"
 	"io/ioutil"
 	"os"

+ 1 - 1
container.go

@@ -8,7 +8,7 @@ import (
 	"github.com/dotcloud/docker/cgroups"
 	"github.com/dotcloud/docker/execdriver"
 	"github.com/dotcloud/docker/graphdriver"
-	"github.com/dotcloud/docker/mount"
+	"github.com/dotcloud/docker/pkg/mount"
 	"github.com/dotcloud/docker/pkg/term"
 	"github.com/dotcloud/docker/utils"
 	"github.com/kr/pty"

+ 1 - 1
execdriver/chroot/driver.go

@@ -3,7 +3,7 @@ package chroot
 import (
 	"fmt"
 	"github.com/dotcloud/docker/execdriver"
-	"github.com/dotcloud/docker/mount"
+	"github.com/dotcloud/docker/pkg/mount"
 	"os"
 	"os/exec"
 )

+ 1 - 1
graphdriver/aufs/aufs.go

@@ -25,7 +25,7 @@ import (
 	"fmt"
 	"github.com/dotcloud/docker/archive"
 	"github.com/dotcloud/docker/graphdriver"
-	mountpk "github.com/dotcloud/docker/mount"
+	mountpk "github.com/dotcloud/docker/pkg/mount"
 	"github.com/dotcloud/docker/utils"
 	"os"
 	"os/exec"

+ 0 - 0
mount/MAINTAINERS → pkg/mount/MAINTAINERS


+ 0 - 0
mount/flags_darwin.go → pkg/mount/flags_darwin.go


+ 0 - 0
mount/flags_linux.go → pkg/mount/flags_linux.go


+ 0 - 0
mount/mount.go → pkg/mount/mount.go


+ 0 - 0
mount/mount_test.go → pkg/mount/mount_test.go


+ 0 - 0
mount/mounter_darwin.go → pkg/mount/mounter_darwin.go


+ 0 - 0
mount/mounter_linux.go → pkg/mount/mounter_linux.go


+ 0 - 0
mount/mountinfo.go → pkg/mount/mountinfo.go


+ 0 - 0
mount/mountinfo_test.go → pkg/mount/mountinfo_test.go