--- subroutines-linux.orig	2003-11-06 10:58:12.000000000 +0100
+++ subroutines-linux	2003-11-11 21:53:14.000000000 +0100
@@ -55,6 +55,9 @@
       syslogd -m 0 -p /tmp/etc/syslogsocket
     }
 
+    if [ -n "$FAI_FIXEDSERVER" ]; then
+        SERVER=${FAI_FIXEDSERVER}
+    fi
     echo "SERVER=$SERVER" >> $rcsfaivar
     create_resolv_conf
     get_fai_dir
@@ -159,6 +162,10 @@
         # first test if a given filename exists on the server
 	testcmd="test -s /boot/fai/$HOSTNAME-localboot ; echo \$?"
 	ret=`$FAI_REMOTESH -l $LOGUSER ${SERVER} "$testcmd"`
+	if [ -z "$ret" ]; then
+	    echo "Error: Problem with ${FAI_REMOTESH} to ${SERVER}!"
+	    ret=0
+	fi
 	if [ "$ret" -ne 0 ]; then
 	    # copy the kernel to the server
 	    $FAI_REMOTECP $target/boot/vmlinuz-* $LOGUSER@${SERVER}:/boot/fai/$HOSTNAME-localboot