Merge pull request #133 from mekanix/feature/dhcpcd

Choose DHCP program
cbsd · Apr 2, 2020 · baeb6be · baeb6be
2 parents 7c2a8ae + b4ae357
commit baeb6be
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -26,6 +26,7 @@ TEMPLATES = Makefile.project \
 	    master.fstab \
 	    mount-project.sh \
 	    named.conf \
+	    network \
 	    pf.conf \
 	    pkg.conf \
 	    reggae-register.sh \

diff --git a/mk/jail-service.mk b/mk/jail-service.mk
@@ -1,4 +1,5 @@
 SUBTYPE ?= vnet
+DHCP ?= dhcpcd
 INTERFACE != reggae get-config INTERFACE
 PKG_MIRROR_CONFIG != reggae get-config PKG_MIRROR
 PKG_REPO_CONFIG != reggae get-config PKG_REPO
@@ -20,6 +21,21 @@ up: setup
 	@sudo cbsd jexec jname=${SERVICE} env ASSUME_ALWAYS_YES=YES pkg bootstrap
 	@sudo cbsd jexec jname=${SERVICE} pkg install -y sudo ${EXTRA_PACKAGES}
 .endif
+.if !exists(${CBSD_WORKDIR}/jails-data/${SERVICE}-data/etc/rc.conf.d/network)
+	@sudo cp ${REGGAE_PATH}/templates/network ${CBSD_WORKDIR}/jails-data/${SERVICE}-data/etc/rc.conf.d/network
+.if ${DHCP} == "dhcpcd"
+	@sudo cbsd jexec jname=${SERVICE} pkg install -y dhcpcd
+	@sudo sed -i "" \
+		-e "s:DHCP:/usr/local/sbin/dhcpcd:g" \
+		${CBSD_WORKDIR}/jails-data/${SERVICE}-data/etc/rc.conf.d/network
+	@sudo cbsd jexec jname=${SERVICE} /bin/pkill -9 dhclient
+	@sudo cbsd jexec jname=${SERVICE} dhcpcd eth0
+.else
+	@sudo sed -i "" \
+		-e "s:DHCP:/sbin/dhclient:g" \
+		${CBSD_WORKDIR}/jails-data/${SERVICE}-data/etc/rc.conf.d/network
+.endif
+.endif
 .if ${DEVEL_MODE} == "YES"
 .if !exists(${CBSD_WORKDIR}/jails-data/${SERVICE}-data/usr/home/devel)
 	@sudo cbsd jexec jname=${SERVICE} pw groupadd devel -g ${GID}

diff --git a/templates/network b/templates/network
@@ -0,0 +1 @@
+dhclient_program="DHCP"
diff --git a/templates/reggae-register.sh b/templates/reggae-register.sh
@@ -2,7 +2,7 @@
 
 ACTION=$1
 IP=$2
-NAME=$3
+NAME=`echo $3 | cut -f 1 -d '.'`
 DOMAIN=$4
 
 ZONE_FILE="/var/unbound/zones/${DOMAIN}.zone"