[SSUS] Replace atftpd by tftpd-hpa

1 files changed, 18 insertions, 12 deletions

diff --git a/satellit_upgrader/pack-update.sh b/satellit_upgrader/pack-update.sh
index 36e54d0..37b96c1 100755
--- a/satellit_upgrader/pack-update.sh
+++ b/satellit_upgrader/pack-update.sh
@@ -80,15 +80,19 @@ addpayload () {
 
 addinstallfile () {
 	echo -n "Includes $1: "
-	local FILENAME=$1
+	local file=$1
+	local path=$(dirname "$file")
 	if [ ! -d "../satellit_installer" ]; then
-		echo "no (satellit_installer not found)"
-	elif [ ! -e "../satellit_installer/static_files/$1" ]; then
-		echo "no (file not found in satellit_installer/static_files)"
-	elif cp "../satellit_installer/static_files/$1" "files/$1"; then
-		echo "yes"
+		echo "NO! (satellit_installer not found)"
+	elif [ ! -e "../satellit_installer/static_files/$file" ]; then
+		echo "NO! (file not found in satellit_installer/static_files)"
 	else
-		echo "...no! (copy failed)"
+		mkdir -p "files/$path" || echo -n "(mkdir failed) "
+		if cp "../satellit_installer/static_files/$file" "files/$file"; then
+			echo "yes"
+		else
+			echo "...no! (copy failed)"
+		fi
 	fi
 }
 
@@ -116,7 +120,6 @@ addpayload "TGZ_LDADP" "ldap/ad proxy"
 addpayload "TGZ_DNBD3" "dnbd3-server"
 
 if [ -z "$LEAN" ]; then
-	addinstallfile "atftpd.service"
 	addinstallfile "lighttpd.conf"
 	addinstallfile "lighttpd-auto-ssl.sh"
 	addinstallfile "lighttpd-include-conf-d.sh"
@@ -126,10 +129,13 @@ if [ -z "$LEAN" ]; then
 	addinstallfile "patch_lighttpd_phpchildren"
 
 	# Not quite ideal, watch out for similar names
-	addinstallfile "dnbd3-server.service"
-	addinstallfile "is-enabled"
-	addinstallfile "server.conf"
-	addinstallfile "rpc.acl"
+	addinstallfile "dnbd3/dnbd3-server.service"
+	addinstallfile "dnbd3/is-enabled"
+	addinstallfile "dnbd3/server.conf"
+	addinstallfile "dnbd3/rpc.acl"
+
+	addinstallfile "tftpd/tftpd-hpa.service"
+	addinstallfile "tftpd/tftpd-hpa"
 
 	# TODO: Unify more
 	source ../satellit_installer/includes/10-sudo_config.inc