branch: b_new_cmd

[fs/lustre-release.git] / lustre / utils / module_setup.sh

diff --git a/lustre/utils/module_setup.sh b/lustre/utils/module_setup.sh
index b8371b4..b2a4353 100755 (executable)
--- a/lustre/utils/module_setup.sh
+++ b/lustre/utils/module_setup.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 MDIR=/lib/modules/`uname -r`/lustre
+/bin/rm -rf $MDIR
 mkdir -p $MDIR
 
 KVER=24
@@ -16,28 +17,44 @@ fi
 
 echo "Copying modules from local build dir to "$MDIR
 
-cp -u ../../lnet/libcfs/libcfs.$EXT $MDIR
 cp -u ../../lnet/lnet/lnet.$EXT $MDIR
+cp -u ../../lnet/libcfs/libcfs.$EXT $MDIR
 cp -u ../../lnet/klnds/socklnd/ksocklnd.$EXT $MDIR
-cp -u ../lvfs/lvfs.$EXT $MDIR
-cp -u ../obdclass/obdclass.$EXT $MDIR
-cp -u ../ptlrpc/ptlrpc.$EXT $MDIR
-cp -u ../mdc/mdc.$EXT $MDIR
-cp -u ../osc/osc.$EXT $MDIR
-cp -u ../lov/lov.$EXT $MDIR
-cp -u ../mds/mds.$EXT $MDIR
-cp -u ../lvfs/$FSFLT.$EXT $MDIR
-[ $KVER == "26" ] && cp -u ../ldiskfs/ldiskfs.$EXT $MDIR
-cp -u ../ost/ost.$EXT $MDIR
-cp -u ../obdfilter/obdfilter.$EXT $MDIR
-cp -u ../llite/llite.$EXT $MDIR
-cp -u ../mgc/mgc.$EXT $MDIR
-cp -u ../mgs/mgs.$EXT $MDIR
+cp -u ../../lnet/tests/pingcli.$EXT $MDIR
+cp -u ../../lnet/tests/pingsrv.$EXT $MDIR
+cp -u ../../lustre/mgs/mgs.$EXT $MDIR
+cp -u ../../lustre/quota/lquota.$EXT $MDIR
+cp -u ../../lustre/quota/quotacheck_test.$EXT $MDIR
+cp -u ../../lustre/quota/quotactl_test.$EXT $MDIR
+cp -u ../../lustre/ptlrpc/ptlrpc.$EXT $MDIR
+cp -u ../../lustre/ptlrpc/gss/ptlrpc_gss.$EXT $MDIR
+cp -u ../../lustre/fld/fld.$EXT $MDIR
+cp -u ../../lustre/lov/lov.$EXT $MDIR
+cp -u ../../lustre/mdc/mdc.$EXT $MDIR
+cp -u ../../lustre/llite/lustre.$EXT $MDIR
+cp -u ../../lustre/obdclass/llog_test.$EXT $MDIR
+cp -u ../../lustre/obdclass/obdclass.$EXT $MDIR
+cp -u ../../lustre/mdt/mdt.$EXT $MDIR
+cp -u ../../lustre/fid/fid.$EXT $MDIR
+cp -u ../../lustre/mds/mds.$EXT $MDIR
+cp -u ../../lustre/osd/osd.$EXT $MDIR
+cp -u ../../lustre/obdecho/obdecho.$EXT $MDIR
+cp -u ../../lustre/obdfilter/obdfilter.$EXT $MDIR
+cp -u ../../lustre/cmm/cmm.$EXT $MDIR
+cp -u ../../lustre/ldiskfs/ldiskfs.$EXT $MDIR
+cp -u ../../lustre/ldiskfs/quotafmt_test.$EXT $MDIR
+cp -u ../../lustre/mdd/mdd.$EXT $MDIR
+cp -u ../../lustre/osc/osc.$EXT $MDIR
+cp -u ../../lustre/ost/ost.$EXT $MDIR
+cp -u ../../lustre/mgc/mgc.$EXT $MDIR
+cp -u ../../lustre/lvfs/fsfilt_ldiskfs.$EXT $MDIR
+cp -u ../../lustre/lvfs/lvfs.$EXT $MDIR
+cp -u ../../lustre/lmv/lmv.$EXT $MDIR
 
 # prevent warnings on my uml
 rm -f /lib/modules/`uname -r`/modules.*
 echo "Depmod"
-depmod -a -e
+depmod -A -e
 
 echo "Copying mount from local build dir to "$MDIR
 cp -u ../utils/mount.lustre /sbin/.
@@ -51,7 +68,6 @@ if [ `egrep -c "lustre|lnet" $MODFILE` -eq 0 ]; then
     echo "# Lustre modules added by $0" >> $MODFILE
     echo "# Networking options, see /sys/module/lnet/parameters" >> $MODFILE
     echo "options lnet networks=tcp" >> $MODFILE
-    echo "alias lustre llite" >> $MODFILE
     echo "# end Lustre modules" >> $MODFILE
 fi