vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

conmon: minor fixes

Browse source 
This fixes a bug where --conmon wouldn't actually set the conmon binary
path, and also where we weren't setting CFLAGS while compiling conmon.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
This commit is contained in:
Aleksa Sarai 2016-10-02 20:11:16 +11:00
parent bac579a9e5
commit bd9acaf584
No known key found for this signature in database
GPG key ID: 9E18AA267DDB8DB4
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/server/main.go
View file

@ -116,6 +116,7 @@ func main() {
containerDir := c.String("containerdir") containerDir := c.String("containerdir")
sandboxDir := c.String("sandboxdir") sandboxDir := c.String("sandboxdir")
conmonPath := c.String("conmon")
pausePath := c.String("pause") pausePath := c.String("pause")
service, err := server.New(c.String("runtime"), c.String("root"), sandboxDir, containerDir, conmonPath, pausePath) service, err := server.New(c.String("runtime"), c.String("root"), sandboxDir, containerDir, conmonPath, pausePath)
if err != nil { if err != nil {

2
conmon/Makefile
View file

@ -5,7 +5,7 @@ override LIBS += $(shell pkg-config --libs glib-2.0)
override CFLAGS += -Wall -Wextra $(shell pkg-config --cflags glib-2.0) override CFLAGS += -Wall -Wextra $(shell pkg-config --cflags glib-2.0)
conmon: $(obj) conmon: $(obj)
$(CC) -o $@ $^ $(LIBS) $(CC) -o $@ $^ $(CFLAGS) $(LIBS)
.PHONY: clean .PHONY: clean
clean: clean: