From 6707db40319fb8c10ce8cc881a91d3320103c88d Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Tue, 29 Oct 2019 16:02:34 +0100
Subject: [SSPS] mysql has no root passwd anymore, pump not avaliable anymore

---
 satellit_installer/includes/30-setup_dhcp.inc | 60 ---------------------------
 1 file changed, 60 deletions(-)
 delete mode 100644 satellit_installer/includes/30-setup_dhcp.inc

(limited to 'satellit_installer/includes/30-setup_dhcp.inc')

diff --git a/satellit_installer/includes/30-setup_dhcp.inc b/satellit_installer/includes/30-setup_dhcp.inc
deleted file mode 100644
index 14e2d54..0000000
--- a/satellit_installer/includes/30-setup_dhcp.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-install_dhclient() {
-	echo -n "# Installing dhclient (isc-dhclient)..."
-	apt-get install isc-dhcp-client 2>/dev/null 1>&2
-	if [ "$ERR" -ne 0 ]; then
-		echo
-		echo "# WARNING: Could not re-install dhclient (isc-dhcp-client)!"
-		echo "#          This should not happen. I give up."
-		echo "#          Please keep in mind this problem has to be solved"
-		echo "#          before the next boot, as the server will most likely"
-		echo "#          not receive an IP (if not set statically)."
-	else
-		echo " ok."
-	fi
-}
-
-install_pump() {
-	if [ ! $(which pump) ]; then	
-		echo -n "# Installing pump..."
-		apt-get install pump 2>/dev/null 1>&2
-		if [ "$ERR" -ne 0 ]; then
-			echo
-			echo "# WARNING: Could not install pump! This is a problem, as pump"
-			echo "#          is an essential package. The server install will"
-			echo "#          continue, but keep in mind this problem has to be"
-			echo "#          solved before the server will work correctly."
-			echo "# Now re-installing dhclient (isc-dhcp-client)..."
-			install_dhclient
-		else
-			echo " ok."
-		fi
-	fi
-}
-
-uninstall_dhclient() {
-	echo -n "# Uninstalling dhclient (isc-dhclient)..."
-	dpkg --remove isc-dhcp-client 2>/dev/null 1>&2
-	if [ "$ERR" -ne 0 ]; then
-		echo
-		echo "# WARNING: Could not uninstall dhclient (isc-dhcp-client)!"
-		echo "#          This should not happen. I give up."
-		echo "#          Please keep in mind this problem has to be solved"
-		echo "#          before the next boot, as the server will most likely"
-		echo "#          not receive an IP (if not set statically)."
-		echo "# pump will be installed anyway, but keep an eye on possible problems."
-	else
-		echo " ok."
-	fi
-}
-
-setup_dhcp() {
-	echo "#"
-	echo "# First: let's see whether the package isc-dhcp-client is installed,"
-	echo "# as we do not like it due to udp checksum failures using virtIO."
-	echo "# Checking dhcp configuration / utilities..."
-	if [ $(which dhclient) ]; then
-		echo "# dhclient detected. dhclient will be uninstalled due to virtIO-problems."
-		uninstall_dhclient
-	fi
-	install_pump
-}
-- 
cgit v1.2.3-55-g7522