From: Michal Mazur Date: Thu, 4 Jan 2018 15:11:24 +0000 (+0100) Subject: Preserve environment variables when starting VPP X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F9992%2F1;p=odp4vpp.git Preserve environment variables when starting VPP Environment variables may contain configuration for platform drivers. They were lost when starting VPP using 'make run/debug' commands. Change-Id: I47d71b1d47a33cb8386f106bac215208e7030b1d Signed-off-by: Michal Mazur --- diff --git a/Makefile b/Makefile index 3ef236a6..ee59d41b 100644 --- a/Makefile +++ b/Makefile @@ -351,13 +351,13 @@ define run @echo "WARNING: STARTUP_CONF not defined or file doesn't exist." @echo " Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n" @cd $(STARTUP_DIR) && \ - sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) \ + sudo -E $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) \ plugin_path $(subst $(subst ,, ),:,$(wildcard $(1)/*/lib*/vpp_plugins)) endef else define run @cd $(STARTUP_DIR) && \ - sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') \ + sudo -E $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') \ plugin_path $(subst $(subst ,, ),:,$(wildcard $(1)/*/lib*/vpp_plugins)) endef endif