[Fai-commit] r4478 - trunk/debian

[lange at alioth.debian.org]

Author: lange
Date: 2007-08-05 15:34:35 +0000 (Sun, 05 Aug 2007)
New Revision: 4478

Modified:
   trunk/debian/fai-server.postinst
   trunk/debian/fai-server.postrm
Log:
source make-fai-nfsroot.conf and use $TFTPROOT


Modified: trunk/debian/fai-server.postinst
===================================================================
--- trunk/debian/fai-server.postinst	2007-08-05 15:28:36 UTC (rev 4477)
+++ trunk/debian/fai-server.postinst	2007-08-05 15:34:35 UTC (rev 4478)
@@ -30,11 +30,12 @@
 #     installation fails and the `postinst' is called with `abort-upgrade',
 #     `abort-remove' or `abort-deconfigure'.
 
+. /etc/fai/make-fai-nfsroot.conf
 
 case "$1" in
     configure)
 
-	[ -d /srv/tftp/fai ] || mkdir -p /srv/tftp/fai
+	[ -d $TFTPROOT ] || mkdir -p $TFTPROOT
         echo "You might want to edit fai.conf and make-fai-nfsroot.conf in /etc/fai or"
 	echo "go with the defaults. You should edit /etc/fai/apt/sources.list"
 	echo "for faster access to a package repository."

Modified: trunk/debian/fai-server.postrm
===================================================================
--- trunk/debian/fai-server.postrm	2007-08-05 15:28:36 UTC (rev 4477)
+++ trunk/debian/fai-server.postrm	2007-08-05 15:34:35 UTC (rev 4478)
@@ -4,17 +4,18 @@
 
 
 set -e
+. /etc/fai/make-fai-nfsroot.conf
 
 case "$1" in
     purge)
-	rm -rf /srv/tftp/fai /var/run/fai/make-fai-nfsroot
+	rm -rf $TFTPROOT /var/run/fai/make-fai-nfsroot
 	echo "WARNING: removing NFSROOT $NFSROOT"
 	rm -rf $NFSROOT || true
 
         ;;
 
     remove)
-	rmdir /srv/tftp/fai || true
+	rmdir $TFTPROOT || true
 	;;
 
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;;