From 9a03967f0abae4cc1dca00f339c58c31579c45b5 Mon Sep 17 00:00:00 2001 From: Lukas Waslowski Date: Sat, 2 Jan 2016 19:55:37 +0100 Subject: [PATCH] Fix declarations of of execdriver/native.NewDriver to have the same signature. This change is done so that driver_unsupported.go and driver_unsupported_nocgo.go declare the same signature for NewDriver as driver.go. Fixes #19032 Signed-off-by: Lukas Waslowski --- daemon/execdriver/native/driver_unsupported.go | 2 +- daemon/execdriver/native/driver_unsupported_nocgo.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/execdriver/native/driver_unsupported.go b/daemon/execdriver/native/driver_unsupported.go index f4ca76ff06..0162f1bf77 100644 --- a/daemon/execdriver/native/driver_unsupported.go +++ b/daemon/execdriver/native/driver_unsupported.go @@ -9,6 +9,6 @@ import ( ) // NewDriver returns a new native driver, called from NewDriver of execdriver. -func NewDriver(root, initPath string) (execdriver.Driver, error) { +func NewDriver(root string, options []string) (execdriver.Driver, error) { return nil, fmt.Errorf("native driver not supported on non-linux") } diff --git a/daemon/execdriver/native/driver_unsupported_nocgo.go b/daemon/execdriver/native/driver_unsupported_nocgo.go index 757845661b..bc18d1ba5b 100644 --- a/daemon/execdriver/native/driver_unsupported_nocgo.go +++ b/daemon/execdriver/native/driver_unsupported_nocgo.go @@ -9,6 +9,6 @@ import ( ) // NewDriver returns a new native driver, called from NewDriver of execdriver. -func NewDriver(root, initPath string) (execdriver.Driver, error) { +func NewDriver(root string, options []string) (execdriver.Driver, error) { return nil, fmt.Errorf("native driver not supported on non-linux") }