[Fai-commit] r3082 - in trunk: bin debian man

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-23 11:59:38 +0000 (Wed, 23 Nov 2005)
New Revision: 3082

Modified:
   trunk/bin/make-fai-bootfloppy
   trunk/debian/changelog
   trunk/man/make-fai-bootfloppy.8
Log:
add option -I (closes: #337271)


Modified: trunk/bin/make-fai-bootfloppy
===================================================================
--- trunk/bin/make-fai-bootfloppy	2005-11-23 09:03:07 UTC (rev 3081)
+++ trunk/bin/make-fai-bootfloppy	2005-11-23 11:59:38 UTC (rev 3082)
@@ -27,13 +27,14 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 2.5.7, 21-november-2005"
+version="Version 2.6, 23-november-2005"
 set -e
 timeout=15
 mkimage=0
 floppydev=/dev/fd0
 [ -d /floppy ] && mountpoint=/floppy
 [ -d /media  ] && mountpoint=/media/floppy
+CLIENTINTERFACE=eth0
 mountopts="-t ext2"
 sd="savedefault"
 BTYPE=d # default boot protocol is DHCP
@@ -74,6 +75,7 @@
    -f FILE    make a 1440k floppy image in FILE
    -g         use GRUB loader on bootfloppy (default)
    -i FILE    make a 1440k iso9660 image in FILE
+   -I IF      use IF as the client's network interface
    -l         use LILO loader on bootfloppy
    -m DIR     use DIR as mountpoint [/floppy or /media/floppy]
    -s HOST    use this static ip for FAI client; try to get all info from DNS
@@ -141,7 +143,7 @@
 	BROADCAST=`LC_ALL=C ifconfig $SERVERINTERFACE | perl -ne '/Bcast:([0-9\.]+)/ && print $1'`
 	NETMASK=`LC_ALL=C ifconfig $SERVERINTERFACE | perl -ne '/Mask:([0-9\.]+)/ && print $1'`
 	GATEWAY=`LC_ALL=C route -n | grep '^0\.0\.0\.0' | awk '{ print $2 }'`
-	fixedparams="ip=${TARGETIP}:${SERVERIP}:${GATEWAY}:${NETMASK}:${TARGETHOST}::off" 
+	fixedparams="ip=${TARGETIP}:${SERVERIP}:${GATEWAY}:${NETMASK}:${TARGETHOST}:${CLIENTINTERFACE}:off" 
     fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -186,15 +188,15 @@
     menu-title="FAI $KERNELVERSION"
 
     image=$mountpoint/vmlinuz
-    append="ip=::::::any root=/dev/nfs $params"
+    append="ip=:::::$CLIENTINTERFACE:any root=/dev/nfs $params"
     label=FAI-ANY
 
     image=$mountpoint/vmlinuz
-    append="ip=::::::bootp root=/dev/nfs $params"
+    append="ip=:::::$CLIENTINTERFACE:bootp root=/dev/nfs $params"
     label=FAI-BOOTP
 
     image=$mountpoint/vmlinuz
-    append="ip=::::::dhcp root=/dev/nfs $params"
+    append="ip=:::::$CLIENTINTERFACE:dhcp root=/dev/nfs $params"
     label=FAI-DHCP
 
     image=$mountpoint/vmlinuz
@@ -202,7 +204,7 @@
     append="root=/dev/nfs nfsroot=$SERVERIP:$NFSROOT $fixedparams $params"
 
     image=$mountpoint/vmlinuz
-    append="ip=::::::rarp root=/dev/nfs $params"
+    append="ip=:::::$CLIENTINTERFACE:rarp root=/dev/nfs $params"
     label=FAI-RARP
 EOF
     $NFSROOT/sbin/lilo -C $mountpoint/etc/lilo.conf || die "lilo failed."
@@ -276,13 +278,14 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # main part
 
-while getopts "lgvf:s:m:hd:c:Fi:" opt ; do
+while getopts "lgvf:s:m:hd:c:Fi:I:" opt ; do
     case "$opt" in
 	c) cfdir=$OPTARG ;;
 	l) lilo=1 ;;
 	g) grub=1 ;;
         h) usage ;;
         i) mkcd=1; cddev="$OPTARG" ; sd='';;
+        I) CLIENTINTERFACE="$OPTARG" ;;
 	f) mkimage=1; floppydev="$OPTARG" ;;
 	m) mountpoint="$OPTARG" ;;
 	s) TARGETHOST="$OPTARG" ;;

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-23 09:03:07 UTC (rev 3081)
+++ trunk/debian/changelog	2005-11-23 11:59:38 UTC (rev 3082)
@@ -27,11 +27,11 @@
     new test if ssh package is installed (closes: #322759) 
   * subroutines: test if hooks are executable (closes: #338524)
   * make-fai-bootfloppy: fix code for -i when using a relative path
-    (closes: #314551)
+    (closes: #314551), add option -I (closes: #337271)
   * FAIBASE/10-misc: with the new fai-kernels package we can call tune2fs
     even when using a 2.6 kernel (closes: #307147)
   
- -- Thomas Lange <lange at debian.org>  Wed, 23 Nov 2005 09:46:06 +0100
+ -- Thomas Lange <lange at debian.org>  Wed, 23 Nov 2005 12:58:56 +0100
 
 fai (2.8.4) unstable; urgency=high
 

Modified: trunk/man/make-fai-bootfloppy.8
===================================================================
--- trunk/man/make-fai-bootfloppy.8	2005-11-23 09:03:07 UTC (rev 3081)
+++ trunk/man/make-fai-bootfloppy.8	2005-11-23 11:59:38 UTC (rev 3082)
@@ -1,7 +1,7 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .if \n(zZ=1 .ig zZ
 .if \n(zY=1 .ig zY
-.TH make-fai-bootfloppy 8 "26 February 2004" "FAI 2.5.4"
+.TH make-fai-bootfloppy 8 "23 november 2005" "FAI 2.9"
 .de }1
 .ds ]X \&\\*(]B\\
 .nr )E 0
@@ -66,6 +66,9 @@
 .B \-i FILE
 Make a 1440k iso9660 image in FILE (requires also -f FILE).
 .TP
+.B \-I IF
+Use IF as client interface (default: eth0).
+.TP
 .B \-g
 Use GRUB as boot loader (default).
 .TP