Reapply "DOCKER-407 dockerinit should support environment variables l…

…arger than 1000 bytes (updates nvlist-json)" This reverts commit 1a89305.
MerlinDMC · May 26, 2015 · 1819469 · 1819469
1 parent c3d67c6
commit 1819469
Show file tree

Hide file tree

Showing 5 changed files with 455 additions and 247 deletions.
diff --git a/src/dockerinit/Makefile b/src/dockerinit/Makefile
@@ -35,7 +35,7 @@ CPPFLAGS = $(SYSINCDIRS:%=-isystem $(DESTDIR)/%)
 LDFLAGS = $(SYSLIBDIRS:%=-L$(DESTDIR)/%) -Wl,-zassert-deflib -Wl,-zfatal-warnings
 
 JSON_OBJS=json-nvlist/json-nvlist.o
-JSON_LIBS=-lnvpair
+JSON_LIBS=-lnvpair -lcmdutils
 MDATA_OBJS= \
 	mdata-client/dynstr.o \
 	mdata-client/proto.o \