Merge pull request #12831 from Microsoft/10662-nolxconwindows

Windows: Factor out LXC
2015-04-30 17:25:15 -07:00 · 2015-04-30 17:25:15 -07:00 · 6b42d72d86
commit 6b42d72d86
parent d2e380b687 10e2dbf375
7 changed files with 13 additions and 1 deletions
--- a/daemon/execdriver/lxc/driver.go
+++ b/daemon/execdriver/lxc/driver.go
@ -1,3 +1,5 @@
+// +build linux
+
 package lxc

 import (
--- a/daemon/execdriver/lxc/info.go
+++ b/daemon/execdriver/lxc/info.go
@ -1,3 +1,5 @@
+// +build linux
+
 package lxc

 import (
--- a/daemon/execdriver/lxc/info_test.go
+++ b/daemon/execdriver/lxc/info_test.go
@ -1,3 +1,5 @@
+// +build linux
+
 package lxc

 import (
--- a/daemon/execdriver/lxc/init.go
+++ b/daemon/execdriver/lxc/init.go
@ -1,3 +1,5 @@
+// +build linux
+
 package lxc

 import (
--- a/daemon/execdriver/lxc/lxc_init_linux.go
+++ b/daemon/execdriver/lxc/lxc_init_linux.go
@ -1,3 +1,5 @@
+// +build linux
+
 package lxc

 import (
--- a/daemon/execdriver/lxc/lxc_init_unsupported.go
+++ b/daemon/execdriver/lxc/lxc_init_unsupported.go
@ -3,5 +3,5 @@
 package lxc

 func finalizeNamespace(args *InitArgs) error {
-	panic("Not supported on darwin")
+	panic("Not supported on this platform")
 }
--- a/daemon/execdriver/lxc/lxc_template.go
+++ b/daemon/execdriver/lxc/lxc_template.go
@ -1,3 +1,5 @@
+// +build linux
+
 package lxc

 import (