jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge branch 'pr-1579' 

Disable systemd in static build

LGTMs: @crosbymichael @cyphar
Closes #1579
This commit is contained in:
Aleksa Sarai 2017-09-12 08:01:24 +10:00
parent f756d904ce e9944d0f4c
commit f1e19e9744
No known key found for this signature in database
GPG Key ID: 9E18AA267DDB8DB4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcontainer/cgroups/systemd/apply_nosystemd.go
View File

@ -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 {

2
libcontainer/cgroups/systemd/apply_systemd.go
View File

@ -1,4 +1,4 @@
// +build linux
// +build linux,!static_build
package systemd