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

[Thomas Lange]

Author: lange
Date: 2009-10-28 10:42:52 +0000 (Wed, 28 Oct 2009)
New Revision: 5611

Modified:
   trunk/bin/fai-setup
   trunk/debian/changelog
Log:
  set default for $SERVERINTERFACE

Modified: trunk/bin/fai-setup
===================================================================
--- trunk/bin/fai-setup	2009-10-28 10:18:24 UTC (rev 5610)
+++ trunk/bin/fai-setup	2009-10-28 10:42:52 UTC (rev 5611)
@@ -176,6 +176,7 @@
     test -f /etc/init.d/nfs-kernel-server && nfsserver=nfs-kernel-server
     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)
 
     if expr match "$FAI_CONFIG_SRC" 'nfs:\/\/' > /dev/null; then

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-28 10:18:24 UTC (rev 5610)
+++ trunk/debian/changelog	2009-10-28 10:42:52 UTC (rev 5611)
@@ -1,4 +1,4 @@
-fai (3.2.23~beta32) unstable; urgency=low
+fai (3.2.23~beta33) unstable; urgency=low
 
   [ Thomas Lange ]
   * NEWS: add hint about missing packages in nfsroot, changes in
@@ -102,6 +102,7 @@
   * get-config-dir, fai: set FAI to local path, if FAI_CONFIG_SRC is of
     type file: (closes: #481137)
   * fai-setup: add advertisement for FAI questionnaire
+    set default for $SERVERINTERFACE
   * README: upgrade info about mailing list, add info about questionnaire
   * fai: check if make-fai-nfsroot.conf is available if dirinstall is used
     dirinstall now uses $FAI_CONFIG_SRC instead of $FAI_CONFIGDIR
@@ -157,7 +158,7 @@
   [ Holger Levsen ]
   * update to standards version 3.8.2, no changes needed
  
- -- Thomas Lange <lange at debian.org>  Mon, 26 Oct 2009 12:06:28 +0100
+ -- Thomas Lange <lange at debian.org>  Wed, 28 Oct 2009 11:42:44 +0100
 
 fai (3.2.20) unstable; urgency=low