[SSPS] Kill dup files; move tftpd files around

1 files changed, 13 insertions, 12 deletions

diff --git a/satellit_installer/includes/50-install_dnbd3-server.inc b/satellit_installer/includes/50-install_dnbd3-server.inc
index ef0aafd..129242b 100644
--- a/satellit_installer/includes/50-install_dnbd3-server.inc
+++ b/satellit_installer/includes/50-install_dnbd3-server.inc
@@ -1,28 +1,29 @@
 install_dnbd3-server_service() {
-        echo -n " copying dnbd3-server service file... "
-        cp -p "$BASEDIR/static_files/dnbd3-server.service" /etc/systemd/system && echo "ok." || perror "failed."
-        echo -n "# Linking dnbd3-server service file into (/etc/systemd/system/)multi-user.target.wants... "
-        ln -s /etc/systemd/system/dnbd3-server.service /etc/systemd/system/multi-user.target.wants/dnbd3-server.service \
-                && echo "ok." || perror "Could not link dnbd3-server service file into multiuser target!"
+	echo "# copying dnbd3-server service file..."
+	cp -p "$BASEDIR/static_files/dnbd3/dnbd3-server.service" /etc/systemd/system/dnbd3-server.service || perror "failed."
+	echo "# Linking dnbd3-server service file into (/etc/systemd/system/)multi-user.target.wants..."
+	ln -s /etc/systemd/system/dnbd3-server.service /etc/systemd/system/multi-user.target.wants/dnbd3-server.service \
+		|| perror "Could not link dnbd3-server service file into multiuser target!"
 }
 
 install_dnbd3-server() {
 	# $1: directory to install dnbd3-server to
-	echo -n "# Installing dnbd3 server... "
-	mkdir -p "$1" 2>/dev/null
+	echo "# Installing dnbd3 server... "
+	mkdir -p "$1" || perror "mkdir $1 failed"
 	for i in dnbd3-server is-enabled; do
-		cp "$BASEDIR/static_files/$i" "$1"
+		cp -p "$BASEDIR/static_files/dnbd3/$i" "$1/$i" \
+			|| perror "Could not copy $i to $1"
 		chmod +x "$1/$i"
 	done
 	chown -R root:root "$1"
-	
 
-	mkdir -p /etc/dnbd3-server 2>/dev/null
+	mkdir -p /etc/dnbd3-server || perror "mkdir /etc/dnbd3-server failed"
 	for i in rpc.acl server.conf; do
-		cp "$BASEDIR/static_files/$i" /etc/dnbd3-server/
+		cp -p "$BASEDIR/static_files/dnbd3/$i" "/etc/dnbd3-server/$i" \
+			|| perror "Could not copy $i to /etc/dnbd3-server"
 		chmod 644 "/etc/dnbd3-server/$i"
 	done
-	
+
 	install_dnbd3-server_service "/etc/systemd/system/"
 	echo "# dnbd3-server ok."
 }