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

[Thomas Lange]

Author: lange
Date: 2009-04-09 13:27:13 +0000 (Thu, 09 Apr 2009)
New Revision: 5308

Modified:
   trunk/bin/fai-setup
   trunk/debian/changelog
Log:
bin/fai-setup: Do not unconditionally add $FAI_CONFIGDIR to exports(5)
(thanks Sebastian Harl) (closes: #504801)

Modified: trunk/bin/fai-setup
===================================================================
--- trunk/bin/fai-setup	2009-04-09 13:09:02 UTC (rev 5307)
+++ trunk/bin/fai-setup	2009-04-09 13:27:13 UTC (rev 5308)
@@ -178,7 +178,10 @@
 
     addr=$(LC_ALL=C ifconfig $SERVERINTERFACE | grep -v 127.0.0.1 | perl -ne '/addr:([\d.]+)/ && print"$1\n"'|head -1)
     mask=$(LC_ALL=C ifconfig $SERVERINTERFACE | grep -v 127.0.0.1 | perl -ne '/Mask:([\d.]+)/ && print"$1\n"'|head -1)
-    add_export_line $FAI_CONFIGDIR  "$addr/$mask(async,ro,no_subtree_check)"
+
+    if expr match "$FAI_CONFIG_SRC" 'nfs:\/\/' > /dev/null; then
+        add_export_line $FAI_CONFIGDIR  "$addr/$mask(async,ro,no_subtree_check)"
+    fi
     add_export_line $NFSROOT  "$addr/$mask(async,ro,no_subtree_check,no_root_squash)"
     if [ -z "$nfsserver" ]; then
 	echo "Could not find the type of your nfs server. Maybe"

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-09 13:09:02 UTC (rev 5307)
+++ trunk/debian/changelog	2009-04-09 13:27:13 UTC (rev 5308)
@@ -12,6 +12,8 @@
     parsing boot.log, use = and strip off any quotes (closes: #439250)
   * lib/get-config-dir-svn: Make username in svn:// config url optional
     (thanks Alexander Fisher) (closes: #441436)
+  * bin/fai-setup: Do not unconditionally add $FAI_CONFIGDIR to exports(5)
+    (thanks Sebastian Harl) (closes: #504801)
   
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.0.4