[Fai-commit] r2995 - in people/eartoast/bugfix/337271: man scripts

[fai-repository at svn.debian.org]

Author: glaweh-guest
Date: 2005-11-04 08:45:05 +0000 (Fri, 04 Nov 2005)
New Revision: 2995

Modified:
   people/eartoast/bugfix/337271/man/make-fai-bootfloppy.8
   people/eartoast/bugfix/337271/scripts/make-fai-bootfloppy
Log:
* BUGFIX:337271 include an interface name in the kernel-ip configuration
the interface defaults to eth0, but can be changed using make-fai-bootfloppy's
"-I" option
(solves the problem of kernel-ip-configuration getting stuck in dhcp requests 
if there's more than one network interface)


Modified: people/eartoast/bugfix/337271/man/make-fai-bootfloppy.8
===================================================================
--- people/eartoast/bugfix/337271/man/make-fai-bootfloppy.8	2005-11-04 08:42:22 UTC (rev 2994)
+++ people/eartoast/bugfix/337271/man/make-fai-bootfloppy.8	2005-11-04 08:45:05 UTC (rev 2995)
@@ -66,6 +66,9 @@
 .B \-i FILE
 Make a 1440k iso9660 image in FILE (requires also -f FILE).
 .TP
+.B \-I CLIF
+Use CLIF as client interface (default: eth0).
+.TP
 .B \-g
 Use GRUB as boot loader (default).
 .TP

Modified: people/eartoast/bugfix/337271/scripts/make-fai-bootfloppy
===================================================================
--- people/eartoast/bugfix/337271/scripts/make-fai-bootfloppy	2005-11-04 08:42:22 UTC (rev 2994)
+++ people/eartoast/bugfix/337271/scripts/make-fai-bootfloppy	2005-11-04 08:45:05 UTC (rev 2995)
@@ -34,6 +34,7 @@
 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 CLIF    use CLIF 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."
@@ -285,6 +287,7 @@
 	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" ;;