tag 610647 moreinfo
thanks

Hi,

i don't think the init script is the problem. even when attached patch
is applied, tftpd-hpa itself refuses to start.

Could you have a look and let me know if you can reproduce that, and how
you made tftp-hpa work with multiple directories?

Regards,
Daniel

-- 
Address:        Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email:          [email protected]
Internet:       http://people.progress-technologies.net/~daniel.baumann/
>From 3136d10d002eb55a93ab101a1cc50c846256aa7f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <[email protected]>
Date: Sat, 12 Feb 2011 18:57:46 +0100
Subject: [PATCH 2/3] Adding support for multiple server directories in packaging files (Closes: #610647).

---
 debian/tftpd-hpa.init     |   13 ++++++++-----
 debian/tftpd-hpa.postinst |   21 ++++++++++++---------
 debian/tftpd-hpa.postrm   |   11 +++++++----
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/debian/tftpd-hpa.init b/debian/tftpd-hpa.init
index ab6ac64..1efc64a 100644
--- a/debian/tftpd-hpa.init
+++ b/debian/tftpd-hpa.init
@@ -33,11 +33,14 @@ set -e
 
 do_start()
 {
-	if [ ! -d "${TFTP_DIRECTORY}" ]
-	then
-		echo "${TFTP_DIRECTORY} missing, aborting."
-		exit 1
-	fi
+	for _DIRECTORY in ${TFTP_DIRECTORY}
+	do
+		if [ ! -d "${_DIRECTORY}" ]
+		then
+			echo "${_DIRECTORY} missing, aborting."
+			exit 1
+		fi
+	done
 
 	start-stop-daemon --start --quiet --oknodo --exec ${DAEMON} -- \
 		--listen  --user ${TFTP_USERNAME} --address ${TFTP_ADDRESS} \
diff --git a/debian/tftpd-hpa.postinst b/debian/tftpd-hpa.postinst
index 537744d..24695cb 100644
--- a/debian/tftpd-hpa.postinst
+++ b/debian/tftpd-hpa.postinst
@@ -68,19 +68,22 @@ EOF
 
 		if ! getent passwd "${TFTP_USERNAME}"
 		then
-			adduser --system --home ${TFTP_DIRECTORY} --no-create-home --quiet --gecos 'tftp daemon' --group ${TFTP_USERNAME}
+			adduser --system --home $(echo ${TFTP_DIRECTORY} | awk '{ print $1 }') --no-create-home --quiet --gecos 'tftp daemon' --group ${TFTP_USERNAME}
 		else
 			echo "tftpd user (${TFTP_USERNAME}) already exists, doing nothing."
 		fi
 
-		if [ ! -d "${TFTP_DIRECTORY}" ]
-		then
-			mkdir -p "${TFTP_DIRECTORY}"
-			chown root:nogroup ${TFTP_DIRECTORY} -R
-		else
-			echo
-			echo "tftpd-hpa directory (${TFTP_DIRECTORY}) already exists, doing nothing."
-		fi
+		for _DIRECTORY in ${TFTP_DIRECTORY}
+		do
+			if [ ! -d "${_DIRECTORY}" ]
+			then
+				mkdir -p "${_DIRECTORY}"
+				chown root:nogroup ${_DIRECTORY} -R
+			else
+				echo
+				echo "tftpd-hpa directory (${_DIRECTORY}) already exists, doing nothing."
+			fi
+		done
 		;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/tftpd-hpa.postrm b/debian/tftpd-hpa.postrm
index 59ee0ea..fde6171 100644
--- a/debian/tftpd-hpa.postrm
+++ b/debian/tftpd-hpa.postrm
@@ -17,10 +17,13 @@ case "${1}" in
 			deluser --quiet --system ${TFTP_USERNAME}
 		fi
 
-		if [ -d ${TFTP_DIRECTORY} ]
-		then
-			rmdir --ignore-fail-on-non-empty ${TFTP_DIRECTORY} || true
-		fi
+		for _DIRECTORY in ${TFTP_DIRECTORY}
+		do
+			if [ -d ${_DIRECTORY} ]
+			then
+				rmdir --ignore-fail-on-non-empty ${TFTP_DIRECTORY} > /dev/null 2>&1 || true
+			fi
+		done
 		;;
 
 	purge)
-- 
1.7.2.3

Reply via email to