Merge pull request #53 from drachenfels-de/config

Add support for structured config file and `lxcri config` command.

Makefile

@@ -11,7 +11,7 @@ PKG_CONFIG_PATH ?= $(PREFIX)/lib/pkgconfig
 # Note: The default pkg-config directory is search after PKG_CONFIG_PATH
 # Note: (Exported) environment variables are NOT visible in the environment of the $(shell ...) function.
 export PKG_CONFIG_PATH
-LDFLAGS=-X main.version=$(COMMIT) -X main.libexecDir=$(LIBEXEC_DIR)
+LDFLAGS=-X main.version=$(COMMIT) -X main.defaultLibexecDir=$(LIBEXEC_DIR)
 CC ?= cc
 SHELL_SCRIPTS = $(shell find . -name \*.sh)
 GO_SRC = $(shell find . -name \*.go | grep -v _test.go)

cgroup.go

@@ -116,7 +116,7 @@ func configureCgroup(rt *Runtime, c *Container) error {
 }
 
 func configureCgroupPath(rt *Runtime, c *Container) error {
-	if rt.SystemdCgroup {
+	if c.SystemdCgroup {
 		c.CgroupDir = parseSystemdCgroupPath(c.Spec.Linux.CgroupsPath)
 	} else {
 		c.CgroupDir = c.Spec.Linux.CgroupsPath