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

Extract mount into pkg.
brondsem · Jan 20, 2014 · 0f0e582 · 0f0e582
2 parents 3aa27eb + 2e094db
commit 0f0e582
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 4 deletions.
diff --git a/cgroups/cgroups.go b/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"

diff --git a/container.go b/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"

diff --git a/execdriver/chroot/driver.go b/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"
 )

diff --git a/graphdriver/aufs/aufs.go b/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"

diff --git a/mount/MAINTAINERS → pkg/mount/MAINTAINERS b/mount/MAINTAINERS → pkg/mount/MAINTAINERS
diff --git a/mount/flags_darwin.go → pkg/mount/flags_darwin.go b/mount/flags_darwin.go → pkg/mount/flags_darwin.go
diff --git a/mount/flags_linux.go → pkg/mount/flags_linux.go b/mount/flags_linux.go → pkg/mount/flags_linux.go
diff --git a/mount/mount.go → pkg/mount/mount.go b/mount/mount.go → pkg/mount/mount.go
diff --git a/mount/mount_test.go → pkg/mount/mount_test.go b/mount/mount_test.go → pkg/mount/mount_test.go
diff --git a/mount/mounter_darwin.go → pkg/mount/mounter_darwin.go b/mount/mounter_darwin.go → pkg/mount/mounter_darwin.go
diff --git a/mount/mounter_linux.go → pkg/mount/mounter_linux.go b/mount/mounter_linux.go → pkg/mount/mounter_linux.go
diff --git a/mount/mountinfo.go → pkg/mount/mountinfo.go b/mount/mountinfo.go → pkg/mount/mountinfo.go
diff --git a/mount/mountinfo_test.go → pkg/mount/mountinfo_test.go b/mount/mountinfo_test.go → pkg/mount/mountinfo_test.go