|
@@ -8,7 +8,7 @@ import (
|
|
"github.com/dotcloud/docker/archive"
|
|
"github.com/dotcloud/docker/archive"
|
|
"github.com/dotcloud/docker/graphdb"
|
|
"github.com/dotcloud/docker/graphdb"
|
|
"github.com/dotcloud/docker/graphdriver"
|
|
"github.com/dotcloud/docker/graphdriver"
|
|
- _ "github.com/dotcloud/docker/graphdriver/aufs"
|
|
|
|
|
|
+ "github.com/dotcloud/docker/graphdriver/aufs"
|
|
_ "github.com/dotcloud/docker/graphdriver/devmapper"
|
|
_ "github.com/dotcloud/docker/graphdriver/devmapper"
|
|
_ "github.com/dotcloud/docker/graphdriver/dummy"
|
|
_ "github.com/dotcloud/docker/graphdriver/dummy"
|
|
"github.com/dotcloud/docker/utils"
|
|
"github.com/dotcloud/docker/utils"
|
|
@@ -629,6 +629,12 @@ func NewRuntimeFromDirectory(config *DaemonConfig) (*Runtime, error) {
|
|
return nil, err
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if ad, ok := driver.(*aufs.AufsDriver); ok {
|
|
|
|
+ if err := ad.Migrate(path.Join(config.Root, "graph")); err != nil {
|
|
|
|
+ return nil, err
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
if err := linkLxcStart(config.Root); err != nil {
|
|
if err := linkLxcStart(config.Root); err != nil {
|
|
return nil, err
|
|
return nil, err
|
|
}
|
|
}
|