fixed hdw-get & fai routine

[hdw-linux/hdw-linux.git] / scripts / Create-FAI

diff --git a/scripts/Create-FAI b/scripts/Create-FAI
index e88406c..36e4996 100755 (executable)
--- a/scripts/Create-FAI
+++ b/scripts/Create-FAI
@@ -5,19 +5,32 @@
 # script creating a minimal system nfsroot for automated installation of hdw
 #
 
-fairoot="$1"
-myip="`ifconfig eth0 | grep inet\ addr | awk '{ print $2 }' | awk -F: '{ print $2 }'`"
 home_dir=$PWD
+fairoot="$1"
+iface="eth0"
+
+[ "$2" ] && iface="$2"
+
+myip="`ifconfig $iface | grep inet\ addr | awk '{ print $2 }' | awk -F: '{ print $2 }'`"
+
+if [ -z $myip ] ; then
+       echo "unable to figure out your ip addr."
+       echo "pls specify the network interface."
+       echo
+       echo "example: $0 $1 br0"
+       echo
+       exit
+fi
 
 usage()        {
        echo
        echo "usage:"
-       echo "$0 <fai-root>"
+       echo "$0 <fai-root> [<network interface>]"
        echo
        exit
        }
 
-[ "$#" != "1" ] && usage
+[ "$#" -lt "1" ] && usage
 [ ! -d $fairoot ] && usage
 
 echo "reading config ..."
@@ -46,7 +59,7 @@ if [ ! -f ./fai/nfsroot-packages ] ; then
 
        echo "deleting some packages from list now"
        del="linux-libc-headers man-pages binutils gcc m4 autoconf automake"
-       del="$del man make patch bin86 nasm lilo cvs"
+       del="$del man make patch bin86 nasm lilo cvs devfsd"
        del="$del bootdisk" # just by now - may contain kernel image later
        for package in $del; do
                grep -v ^$package ./fai/nfsroot-packages > ./fai/tmp~
@@ -85,7 +98,7 @@ if [ ! -f $fairoot/prepared_nfsroot ] ; then
                rm -f etc/init.d/rc2.d/*${i}
        done
        # modified inittab, rc and bootscript
-       sed "s%| /sbin/btee .*%%g" $home_dir/misc/sysfiles/etc/inittab > \
+       sed "s%| /sbin/btee .*%%g" $home_dir/packages/base/sysvinit/inittab > \
                etc/inittab
        cp $home_dir/misc/fai/fai_boot ./etc/init.d/boot
        sed "s%^FAI_MOUNT_LINE%mount -tnfs $myip:/$home_dir/fai /fai%" \