[Fai-commit] r3675 - trunk/debian

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-07-24 15:12:07 +0000 (Mon, 24 Jul 2006)
New Revision: 3675

Modified:
   trunk/debian/fai-server.dirs
   trunk/debian/fai-server.postinst
   trunk/debian/fai-server.postrm
   trunk/debian/fai-server.prerm
Log:
new handling how to create and remove /srv/tftp/fai and $nfsroot


Modified: trunk/debian/fai-server.dirs
===================================================================
--- trunk/debian/fai-server.dirs	2006-07-24 14:25:10 UTC (rev 3674)
+++ trunk/debian/fai-server.dirs	2006-07-24 15:12:07 UTC (rev 3675)
@@ -2,4 +2,3 @@
 etc/fai
 usr/bin
 usr/sbin
-srv/tftp/fai

Modified: trunk/debian/fai-server.postinst
===================================================================
--- trunk/debian/fai-server.postinst	2006-07-24 14:25:10 UTC (rev 3674)
+++ trunk/debian/fai-server.postinst	2006-07-24 15:12:07 UTC (rev 3675)
@@ -34,6 +34,7 @@
 case "$1" in
     configure)
 
+	[ -d /srv/tftp/fai ] || mkdir -p /srv/tftp/fai
         echo "Now edit fai.conf, make-fai-nfsroot.conf and sources.list in /etc/fai and call fai-setup."
 	echo "Especially, you'll have to replace the placeholder INSTALLSERVER in /etc/fai/fai.conf."
         ;;

Modified: trunk/debian/fai-server.postrm
===================================================================
--- trunk/debian/fai-server.postrm	2006-07-24 14:25:10 UTC (rev 3674)
+++ trunk/debian/fai-server.postrm	2006-07-24 15:12:07 UTC (rev 3675)
@@ -7,9 +7,15 @@
 
 case "$1" in
     purge)
-        rm -rf /srv/tftp/fai /var/run/fai  
+	rm -rf /srv/tftp/fai /var/run/fai
+	echo "WARNING: removing NFSROOT $NFSROOT"
+	rm -rf $NFSROOT || true
+
         ;;
 
+    remove)
+	rmdir /srv/tftp/fai || true
+
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;;
 
     *)

Modified: trunk/debian/fai-server.prerm
===================================================================
--- trunk/debian/fai-server.prerm	2006-07-24 14:25:10 UTC (rev 3674)
+++ trunk/debian/fai-server.prerm	2006-07-24 15:12:07 UTC (rev 3675)
@@ -38,9 +38,6 @@
 	    echo "\$NFSROOT is not set. Please check your settings in fai.conf."
 	    exit 4
 	fi
-	echo "WARNING: removing NFSROOT $NFSROOT"
-	sleep 2
-	rm -rf $NFSROOT || true
 
 	perl -ni.bak -e "print unless m#^$FAI_CONFIGDIR\s|^$NFSROOT\s#" /etc/exports
 	[ -n "$nfsserver" ] && /etc/init.d/$nfsserver reload || true