kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #6106 from discordianfish/improve-error-btrfs-on-non-btrfs

Browse source 
Add ErrPrerequisites to improve misleading errors
This commit is contained in:
Michael Crosby 2014-05-29 11:00:13 -07:00
commit e2935f9c16
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/graphdriver/btrfs/btrfs.go
View file

@ -18,6 +18,10 @@ import (
"unsafe"
)
const (
btrfsSuperMagic = 0x9123683E
)
func init() {
graphdriver.Register("btrfs", Init)
}
@ -30,8 +34,8 @@ func Init(home string) (graphdriver.Driver, error) {
return nil, err
}
if buf.Type != 0x9123683E {
return nil, graphdriver.ErrNotSupported
if buf.Type != btrfsSuperMagic {
return nil, graphdriver.ErrPrerequisites
}
return &Driver{

7
daemon/graphdriver/driver.go
View file

@ -44,7 +44,8 @@ var (
"vfs",
}
ErrNotSupported = errors.New("driver not supported")
ErrNotSupported = errors.New("driver not supported")
ErrPrerequisites = errors.New("Prerequisites for driver not satisfied (wrong filesystem?)")
)
func init() {
@ -78,7 +79,7 @@ func New(root string) (driver Driver, err error) {
for _, name := range priority {
driver, err = GetDriver(name, root)
if err != nil {
if err == ErrNotSupported {
if err == ErrNotSupported || err == ErrPrerequisites {
continue
}
return nil, err
@ -89,7 +90,7 @@ func New(root string) (driver Driver, err error) {
// Check all registered drivers if no priority driver is found
for _, initFunc := range drivers {
if driver, err = initFunc(root); err != nil {
if err == ErrNotSupported {
if err == ErrNotSupported || err == ErrPrerequisites {
continue
}
return nil, err

2
daemon/graphdriver/graphtest/graphtest.go
View file

@ -31,7 +31,7 @@ func newDriver(t *testing.T, name string) *Driver {
d, err := graphdriver.GetDriver(name, root)
if err != nil {
if err == graphdriver.ErrNotSupported {
if err == graphdriver.ErrNotSupported || err == graphdriver.ErrPrerequisites {
t.Skip("Driver %s not supported", name)
}
t.Fatal(err)