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

[Thomas Lange]

Author: lange
Date: 2009-10-28 15:31:29 +0000 (Wed, 28 Oct 2009)
New Revision: 5618

Modified:
   trunk/bin/fai-setup
   trunk/debian/changelog
Log:
include subnet mask in variable for NFS exports

Modified: trunk/bin/fai-setup
===================================================================
--- trunk/bin/fai-setup	2009-10-28 13:41:45 UTC (rev 5617)
+++ trunk/bin/fai-setup	2009-10-28 15:31:29 UTC (rev 5618)
@@ -6,7 +6,7 @@
 # fai-setup -- set up FAI
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2000-2008 by Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2000-2009 by Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 #
 #*********************************************************************
@@ -177,7 +177,7 @@
     test -f /etc/init.d/nfs-user-server && nfsserver=nfs-user-server
 
     : ${SERVERINTERFACE:=eth0}  # set to eth0 if not already set
-    addr=$(ip addr show dev $SERVERINTERFACE | grep -w inet | cut -d t -f 2 | cut -d ' ' -f 2 | cut -d / -f 1 | grep -v 127.0.0.1 | head -1)
+    addr=$(ip addr show dev $SERVERINTERFACE | grep -w inet | cut -d t -f 2 | cut -d ' ' -f 2 | head -1)
 
     if expr match "$FAI_CONFIG_SRC" 'nfs:\/\/' > /dev/null; then
         add_export_line $FAI_CONFIGDIR  "$addr(async,ro,no_subtree_check)"

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-28 13:41:45 UTC (rev 5617)
+++ trunk/debian/changelog	2009-10-28 15:31:29 UTC (rev 5618)
@@ -40,6 +40,7 @@
     task_sysinfo, S99fai-setup/FAISERVER: Replaced all calls to ifconfig
     by proper ip + shell magic calls (closes: #524347). Thanks to Luk
     Claes for the patch
+  * include subnet mask in variable for NFS exports
   * fai-savelog: cd to the right place if LOGREMOTEDIR is set, thanks to
     Robin Powell for the patch (closes: #515704)
   * fai-mirror: remove use of $addpackages (closes: #537544)