[Fai-commit] r5547 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2009-10-16 20:56:28 +0000 (Fri, 16 Oct 2009)
New Revision: 5547

Modified:
   trunk/bin/fai
   trunk/debian/changelog
Log:
fai: check if make-fai-nfsroot.conf is available if dirinstall is used

Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2009-10-16 13:35:02 UTC (rev 5546)
+++ trunk/bin/fai	2009-10-16 20:56:28 UTC (rev 5547)
@@ -245,6 +245,11 @@
     fi
     unset fs
 
+    if [ ! -e $FAI_ETC_DIR/make-fai-nfsroot.conf ]; then
+	echo "$FAI_ETC_DIR/make-fai-nfsroot.conf not found."
+	echo "You may want to install the package fai-server"
+	exit 7
+    fi
     export NFSROOT=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf; echo $NFSROOT)
     export FAI_DEBOOTSTRAP=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf; echo $FAI_DEBOOTSTRAP)
     export FAI_DEBOOTSTRAP_OPTS=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf; echo $FAI_DEBOOTSTRAP_OPTS)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-16 13:35:02 UTC (rev 5546)
+++ trunk/debian/changelog	2009-10-16 20:56:28 UTC (rev 5547)
@@ -86,6 +86,7 @@
     type file: (closes: #481137)
   * fai-setup: add advertisement for FAI questionnaire
   * README: upgrade info about mailing list, add info about questionnaire
+  * fai: check if make-fai-nfsroot.conf is available if dirinstall is used
   
   [ Michael Tautschnig ]
   * setup-storage, setup-storage/Exec.pm: auto-detect a proper way to tell