From 74b34c2a03d6288557ff0e3ba106df6e597740f4 Mon Sep 17 00:00:00 2001 From: "Martine S. Lenders" Date: Tue, 10 Mar 2020 16:17:06 +0100 Subject: [PATCH] examples: bootstrap host-side DHCPv6 server with gnrc_border_router --- examples/gnrc_border_router/Makefile | 2 +- examples/gnrc_border_router/Makefile.ethos.conf | 4 ++-- examples/gnrc_border_router/Makefile.slip.conf | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/gnrc_border_router/Makefile b/examples/gnrc_border_router/Makefile index 00348ed2fe..acf337533f 100644 --- a/examples/gnrc_border_router/Makefile +++ b/examples/gnrc_border_router/Makefile @@ -52,7 +52,7 @@ QUIET ?= 1 # Ethos/native TAP interface and UHCP prefix can be configured from make command TAP ?= tap0 -IPV6_PREFIX ?= 2001:db8::/64 +IPV6_PREFIX ?= 2001:db8::/32 # MODULE DEPENDENT CONFIGURATION IMPORT # ===================================== diff --git a/examples/gnrc_border_router/Makefile.ethos.conf b/examples/gnrc_border_router/Makefile.ethos.conf index 138ee5077b..4d8c504738 100644 --- a/examples/gnrc_border_router/Makefile.ethos.conf +++ b/examples/gnrc_border_router/Makefile.ethos.conf @@ -3,10 +3,10 @@ CFLAGS += -DETHOS_BAUDRATE=$(ETHOS_BAUDRATE) STATIC_ROUTES ?= 1 ifeq (1,$(USE_DHCPV6)) - ETHOS_ONLY=--ethos-only + FLAGS_EXTRAS=--use-dhcpv6 endif # Configure terminal parameters TERMDEPS += host-tools TERMPROG ?= sudo sh $(RIOTTOOLS)/ethos/start_network.sh -TERMFLAGS ?= $(ETHOS_ONLY) $(PORT) $(TAP) $(IPV6_PREFIX) +TERMFLAGS ?= $(FLAGS_EXTRAS) $(PORT) $(TAP) $(IPV6_PREFIX) diff --git a/examples/gnrc_border_router/Makefile.slip.conf b/examples/gnrc_border_router/Makefile.slip.conf index 7721ff6fb9..a6d420d3c9 100644 --- a/examples/gnrc_border_router/Makefile.slip.conf +++ b/examples/gnrc_border_router/Makefile.slip.conf @@ -5,10 +5,10 @@ CFLAGS += -DSLIPDEV_PARAM_BAUDRATE=$(SLIP_BAUDRATE) STATIC_ROUTES ?= 1 ifeq (1,$(USE_DHCPV6)) - SLIP_ONLY=-e + FLAGS_EXTRAS=-d endif # Configure terminal parameters TERMDEPS += sliptty TERMPROG ?= sudo sh $(RIOTTOOLS)/sliptty/start_network.sh -TERMFLAGS ?= $(SLIP_ONLY) $(IPV6_PREFIX) $(PORT) $(SLIP_BAUDRATE) +TERMFLAGS ?= $(FLAGS_EXTRAS) $(IPV6_PREFIX) $(PORT) $(SLIP_BAUDRATE)