[Fai-commit] r5742 - trunk/debian

[Thomas Lange]

Author: lange
Date: 2010-03-18 12:25:39 +0000 (Thu, 18 Mar 2010)
New Revision: 5742

Modified:
   trunk/debian/changelog
   trunk/debian/fai-quickstart.postinst
Log:
fai-quickstart.postinst: abort if $FAI_CONFIGDIR defined in the wrong
config file, thanks to Henning Sprang for the patch (closes: #571265)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-03-17 12:25:44 UTC (rev 5741)
+++ trunk/debian/changelog	2010-03-18 12:25:39 UTC (rev 5742)
@@ -1,4 +1,4 @@
-fai (3.3.4~beta2) unstable; urgency=low
+fai (3.3.4~beta3) unstable; urgency=low
 
   [ Thomas Lange ]
   * make-fai-nfsroot: fix matching of hook names
@@ -8,6 +8,8 @@
   * disk-info: do not return size of disks, return only device names, 
   * subroutines: adjust set_disk_info to new behaviour of disk-info
   * savelog.LAST.source: add pattern
+  * fai-quickstart.postinst: abort if $FAI_CONFIGDIR defined in the wrong
+    config file, thanks to Henning Sprang for the patch (closes: #571265)
   
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.2.1
@@ -22,7 +24,7 @@
   * setup-storage/Commands.pm: Work around missing ext4 support in parted
     (thanks Stefan Goetz for the patch) (closes: #572120)
 
- -- Thomas Lange <lange at debian.org>  Wed, 17 Mar 2010 13:25:33 +0100
+ -- Thomas Lange <lange at debian.org>  Thu, 18 Mar 2010 13:25:26 +0100
 
 fai (3.3.3) unstable; urgency=low
 

Modified: trunk/debian/fai-quickstart.postinst
===================================================================
--- trunk/debian/fai-quickstart.postinst	2010-03-17 12:25:44 UTC (rev 5741)
+++ trunk/debian/fai-quickstart.postinst	2010-03-18 12:25:39 UTC (rev 5742)
@@ -21,6 +21,8 @@
 	if egrep -q ^FAI_CONFIGDIR= /etc/fai/fai.conf; then
 	    echo "WARNING: The variable \$FAI_CONFIGDIR is still defined in /etc/fai/fai.conf."
 	    echo "Please move it to /etc/fai/make-fai-nfsroot.conf."
+	    echo "NOT doing any further configuration - please copy your configspace yourself"
+	    exit 0
 	fi
 
 	. /etc/fai/make-fai-nfsroot.conf