From 6a337bb11ab0b7b5cfd711f3f457e4f67f0d7f27 Mon Sep 17 00:00:00 2001
From: mischa <mischa@rx.high5.nl>
Date: Sat, 6 May 2023 16:21:14 +0200
Subject: [PATCH] remove DHCPD option, will need to run dhcpd per host for
 autoinstall

---
 _deploy.conf |  1 -
 cease.sh     |  4 +---
 deploy.pl    |  5 +----
 launch.sh    | 16 ++++++----------
 relaunch.sh  | 16 ++++++----------
 5 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/_deploy.conf b/_deploy.conf
index 6926cb4..e32c195 100644
--- a/_deploy.conf
+++ b/_deploy.conf
@@ -22,7 +22,6 @@ VMDUSERS="vmdusers"
 SWITCH="uplink_vlan931 uplink_vlan910"
 INTERFACE="veb931 veb910"
 # dhcpd.conf
-#DHCPD="no"
 ROUTER="46.23.93.1"
 DNS="46.23.80.26"
 SUBNET="46.23.93.0"
diff --git a/cease.sh b/cease.sh
index b9769b5..c4b2c91 100755
--- a/cease.sh
+++ b/cease.sh
@@ -40,9 +40,7 @@ if vmctl show ${1%.txt} >/dev/null 2>&1; then
 		dig +short -x $(grep -A2 ${1%.txt} /etc/dhcpd.conf | awk '/fixed/ {print $2}' | tr -d ';')
 		remove.pl ${1}
 		deploy.pl
-		if [[ -z ${DHCPD} ]]; then
-			rcctl restart dhcpd
-		fi
+		rcctl restart dhcpd
 		vmctl reload
 	fi
 fi
diff --git a/deploy.pl b/deploy.pl
index 5978ce3..3dc6432 100755
--- a/deploy.pl
+++ b/deploy.pl
@@ -198,7 +198,6 @@ sub render_install_conf {
 			my $jot_pass = qx(jot -rcs '' 20 46 125);
 			chomp($jot_pass);
 			my $_ipv4 = $vms{$vm_name}{'ipv4'} || "autoconf";
-			$_ipv4 = "autoconf" if $conf{'conf'}{'DHCPD'} eq "yes";
 			my $_ipv4_gateway = $vms{$vm_name}{'ipv4_gw'} || $conf{'conf'}{'ROUTER'};
 			my $_ipv6 = $vms{$vm_name}{'ipv6'} || $conf{'conf'}{'IPV6_PREFIX'} . ":" . ($conf{'conf'}{'IPV6_START'} + $vms{$vm_name}{'vm_number'}) . "::" . ($conf{'conf'}{'IP_START'} + $vms{$vm_name}{'vm_number'});
 			my $_ipv6_gateway = $vms{$vm_name}{'ipv6_gw'} || $conf{'conf'}{'IPV6_PREFIX'} . ":" . ($conf{'conf'}{'IPV6_START'} + $vms{$vm_name}{'vm_number'}) . "::1";
@@ -364,12 +363,10 @@ my %vms;
 my @files = glob "$conf{'conf'}{'VMS'}/*.txt";
 %vms = get_variables('vms', @files);
 
-$conf{'conf'}{'DHCPD'} = "yes" if (! $conf{'conf'}{'DHCPD'});
-
 # run all functions
 #debug_parse(\%conf, \%vms);
 render_vm_conf(\%conf, \%vms);
-render_dhcpd_conf(\%conf, \%vms) if $conf{'conf'}{'DHCPD'} eq "yes";
+render_dhcpd_conf(\%conf, \%vms);
 render_install_conf(\%conf, \%vms);
 create_accounts(\%conf, \%vms);
 create_img_files(\%conf, \%vms);
diff --git a/launch.sh b/launch.sh
index acec47c..8a26a7f 100755
--- a/launch.sh
+++ b/launch.sh
@@ -56,12 +56,10 @@ if [[ "${SERVER}" == server* ]] || [[ "${SERVER}" == mega* ]]; then
 fi
 
 deploy.pl
-sleep 10
-if [[ -z ${DHCPD} ]]; then
-	rcctl restart dhcpd
-fi
+sleep 5
+rcctl restart dhcpd
 vmctl reload
-sleep 10
+sleep 5
 
 mkfifo -m 600 /tmp/pipe_${1}
 install -g mischa -m 600 -o mischa /dev/null ${LOGS}/${1}.log
@@ -88,12 +86,10 @@ done > /tmp/pipe_${1} 2> ${LOGS}/${1}.log
 echo "completed"
 
 deploy.pl
-sleep 10
-if [[ -z ${DHCPD} ]]; then
-	rcctl restart dhcpd
-fi
+sleep 5
+rcctl restart dhcpd
 vmctl reload
-sleep 10
+sleep 5
 
 echo "booting ${INSTANCE}"
 
diff --git a/relaunch.sh b/relaunch.sh
index 1209daf..50a8296 100755
--- a/relaunch.sh
+++ b/relaunch.sh
@@ -44,12 +44,10 @@ if [[ -z ${INSTANCE} ]]; then
 fi
 
 deploy.pl
-sleep 10
-if [[ -z ${DHCPD} ]]; then
-	rcctl restart dhcpd
-fi      
+sleep 5
+rcctl restart dhcpd
 vmctl reload
-sleep 10
+sleep 5
 
 mkfifo -m 600 /tmp/pipe_${1}
 install -g mischa -m 600 -o mischa /dev/null ${LOGS}/${1}.log
@@ -76,12 +74,10 @@ done > /tmp/pipe_${1} 2> ${LOGS}/${1}.log
 echo "completed"
 
 deploy.pl
-sleep 10
-if [[ -z ${DHCPD} ]]; then
-	rcctl restart dhcpd
-fi
+sleep 5
+rcctl restart dhcpd
 vmctl reload
-sleep 10
+sleep 5
 
 echo "booting ${INSTANCE}"