Skip to content

Commit

Permalink
If storage.conf graphdriver=="", devmapper shouldn't be tried
Browse files Browse the repository at this point in the history
This patch removes devicemapper from the list of drivers tried when driver=""

This change is necessary since tests in tools that use containers storage are
being run when driver is not being specified. In this situation the test fails
because devmapper returns and error other then ErrNotSupported.   With this
change a useful message will go to the logs if the user actually specifies
"devicemapper" in config.

Signed-off-by: Daniel J Walsh <[email protected]>
  • Loading branch information
rhatdan committed May 21, 2018
1 parent 932e49f commit 5267ca2
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/driver_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ var (
// Slice of drivers that should be used in an order
priority = []string{
"overlay",
"devicemapper",
// We don't support devicemapper without configuration
// "devicemapper",
"aufs",
"btrfs",
"zfs",
Expand Down

0 comments on commit 5267ca2

Please sign in to comment.