--- /usr/sbin/fai-chboot_org    2013-03-17 16:38:01.519470172 +0100
+++ /usr/sbin/fai-chboot        2013-03-17 15:42:06.219470569 +0100
@@ -387,6 +387,9 @@
 ($opt_S and $opt_I) && die "ERROR: use only one option out of -I and -S\n";
 #TODO: also -e, -r and -c can't be used together

+$server = `. $cfdir/nfsroot.conf 2>/dev/null; echo \$SERVER`;
+chomp $server;
+
 # read the nfsroot variable; a little bit ugly, but it works
 $nfsroot = `. $cfdir/nfsroot.conf 2>/dev/null; echo \$NFSROOT`;
 chomp $nfsroot;
@@ -457,7 +460,7 @@
   # create config so host will boot the install kernel
   $kernelname = "kernel vmlinuz-$kernelsuffix";
   $initrd     = "initrd=initrd.img-$kernelsuffix";
-  $rootfs     = "root=/dev/nfs nfsroot=$nfsroot $bopt";
+  $rootfs     = "root=/dev/nfs nfsroot=$server:$nfsroot $bopt";
   $bootprot   = "ip=dhcp ";

 } elsif ($opt_o) {