Skip to content

Commit

Permalink
Merge pull request moby#14753 from flavio/zfs-initialization-errors
Browse files Browse the repository at this point in the history
ZFS driver: raise better errors during init
  • Loading branch information
cpuguy83 committed Jul 22, 2015
2 parents 40b9224 + f95b3a6 commit 19ba7f9
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions daemon/graphdriver/zfs/zfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,19 @@ func (*Logger) Log(cmd []string) {

func Init(base string, opt []string) (graphdriver.Driver, error) {
var err error

if _, err := exec.LookPath("zfs"); err != nil {
log.Debugf("[zfs] zfs command is not available: %v", err)
return nil, graphdriver.ErrPrerequisites
}

file, err := os.OpenFile("/dev/zfs", os.O_RDWR, 600)
if err != nil {
log.Debugf("[zfs] cannot open /dev/zfs: %v", err)
return nil, graphdriver.ErrPrerequisites
}
defer file.Close()

options, err := parseOptions(opt)
if err != nil {
return nil, err
Expand All @@ -53,16 +66,6 @@ func Init(base string, opt []string) (graphdriver.Driver, error) {
}
}

if _, err := exec.LookPath("zfs"); err != nil {
return nil, fmt.Errorf("zfs command is not available: %v", err)
}

file, err := os.OpenFile("/dev/zfs", os.O_RDWR, 600)
if err != nil {
return nil, fmt.Errorf("cannot open /dev/zfs: %v", err)
}
defer file.Close()

if options.fsName == "" {
options.fsName, err = lookupZfsDataset(rootdir)
if err != nil {
Expand Down

0 comments on commit 19ba7f9

Please sign in to comment.