From 00072a1d9856ea14d352d4a74e377784e393b3f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Goran=20Meki=C4=87?= Date: Sat, 8 Apr 2023 08:37:02 +0200 Subject: [PATCH] Switch between dhclient and dhcpcd --- mk/base-jail.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mk/base-jail.mk b/mk/base-jail.mk index 303836f..d055a2c 100644 --- a/mk/base-jail.mk +++ b/mk/base-jail.mk @@ -1,5 +1,6 @@ BASE_WORKDIR != reggae get-config BASE_WORKDIR PKG_PROXY != reggae get-config PKG_PROXY +DHCP ?= dhclient MKJAIL_OPTIONS = .if exists(${EXTRA_FSTAB}) @@ -75,6 +76,10 @@ setup: .endif .if !exists(${BASE_WORKDIR}/${SERVICE}) @sudo env PRESTART="${PRESTART}" POSTSTART="${POSTSTART}" PRESTOP="${PRESTOP}" POSTSTOP="${POSTSTOP}" OS_VERSION="${VERSION}" reggae mkjail ${MKJAIL_OPTIONS} ${SERVICE} +.if ${DHCP} == "dhcpcd" + @sudo chroot ${BASE_WORKDIR}/${SERVICE} pkg install -y dhcpcd + @echo dhclient_program="/usr/local/sbin/dhcpcd" | sudo tee -a ${BASE_WORKDIR}/${SERVICE}/etc/rc.conf >/dev/null +.endif .endif .if ${DEVEL_MODE} == "YES" -@sudo mount -t nullfs ${PWD} ${BASE_WORKDIR}/${SERVICE}/usr/src >/dev/null 2>&1