Move graph driver registration out of the daemon package.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

daemon/daemon.go

@@ -30,7 +30,8 @@ import (
 	"github.com/docker/docker/daemon/exec"
 	"github.com/docker/docker/daemon/execdriver"
 	"github.com/docker/docker/daemon/execdriver/execdrivers"
-	_ "github.com/docker/docker/daemon/graphdriver/vfs" // register vfs
+	// register graph drivers
+	_ "github.com/docker/docker/daemon/graphdriver/register"
 	"github.com/docker/docker/daemon/logger"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/distribution"

daemon/daemon_aufs.go → daemon/graphdriver/register/register_aufs.go

@@ -1,6 +1,6 @@
 // +build !exclude_graphdriver_aufs,linux
 
-package daemon
+package register
 
 import (
 	// register the aufs graphdriver

daemon/daemon_btrfs.go → daemon/graphdriver/register/register_btrfs.go

@@ -1,6 +1,6 @@
 // +build !exclude_graphdriver_btrfs,linux
 
-package daemon
+package register
 
 import (
 	// register the btrfs graphdriver

daemon/daemon_devicemapper.go → daemon/graphdriver/register/register_devicemapper.go

@@ -1,6 +1,6 @@
 // +build !exclude_graphdriver_devicemapper,linux
 
-package daemon
+package register
 
 import (
 	// register the devmapper graphdriver

daemon/daemon_overlay.go → daemon/graphdriver/register/register_overlay.go

@@ -1,6 +1,6 @@
 // +build !exclude_graphdriver_overlay,linux
 
-package daemon
+package register
 
 import (
 	// register the overlay graphdriver

daemon/graphdriver/register/register_vfs.go

@@ -0,0 +1,6 @@
+package register
+
+import (
+	// register vfs
+	_ "github.com/docker/docker/daemon/graphdriver/vfs"
+)

daemon/graphdriver/register/register_windows.go

@@ -0,0 +1,6 @@
+package register
+
+import (
+	// register the windows graph driver
+	_ "github.com/docker/docker/daemon/graphdriver/windows"
+)

daemon/daemon_zfs.go → daemon/graphdriver/register/register_zfs.go

@@ -1,6 +1,6 @@
 // +build !exclude_graphdriver_zfs,linux !exclude_graphdriver_zfs,freebsd
 
-package daemon
+package register
 
 import (
 	// register the zfs driver