How about adding a setting in /etc/fai.conf for rsh or ssh. It looks like rsh/rcp is hard-coded in the subroutines file, should be easy enough to make it use ssh/scp instead. I could probably throw together a patch for this if you think its worth including James