aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Mazur <mkm@semihalf.com>2018-01-04 16:11:24 +0100
committerMichal Mazur <mkm@semihalf.com>2018-01-08 15:29:09 +0100
commite6e8af488c26f5cfe380e5c6fd141f74bafedc7d (patch)
tree295de702fd199ce06d60ad77090e4d6d56fe26f7
parent7abe5825508fd48d6b010a3eaff346d715e17e24 (diff)
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 <mkm@semihalf.com>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 3ef236a..ee59d41 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