merge branch 'pr-1579'

cyphar · cyphar · commit f1e19e974454 · 2017-09-12T08:01:24.000+10:00
Disable systemd in static build LGTMs: @crosbymichael @cyphar Closes #1579
diff --git a/libcontainer/cgroups/systemd/apply_nosystemd.go b/libcontainer/cgroups/systemd/apply_nosystemd.go
@@ -1,4 +1,4 @@
-// +build !linux
+// +build !linux static_build
 
 package systemd
 
@@ -43,7 +43,7 @@ func (m *Manager) GetStats() (*cgroups.Stats, error) {
 }
 
 func (m *Manager) Set(container *configs.Config) error {
-	return nil, fmt.Errorf("Systemd not supported")
+	return fmt.Errorf("Systemd not supported")
 }
 
 func (m *Manager) Freeze(state configs.FreezerState) error {
diff --git a/libcontainer/cgroups/systemd/apply_systemd.go b/libcontainer/cgroups/systemd/apply_systemd.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,!static_build
 
 package systemd
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build !linux`
	`1`	`+// +build !linux static_build`
`2`	`2`
`3`	`3`	`package systemd`
`4`	`4`
`@@ -43,7 +43,7 @@ func (m Manager) GetStats() (cgroups.Stats, error) {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`func (m Manager) Set(container configs.Config) error {`
`46`		`- return nil, fmt.Errorf("Systemd not supported")`
	`46`	`+ return fmt.Errorf("Systemd not supported")`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`func (m *Manager) Freeze(state configs.FreezerState) error {`