X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fmodule_setup.sh;h=9f9792f77ca90251f39e9ee7388bcc9e5d456ace;hb=956b4238baa1a9c582c14c625748e64cc13922ba;hp=07c64ee21909b94e870163d2120a8fa766a5f020;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git

diff --git a/lustre/utils/module_setup.sh b/lustre/utils/module_setup.sh
index 07c64ee..9f9792f 100755
--- a/lustre/utils/module_setup.sh
+++ b/lustre/utils/module_setup.sh
@@ -1,40 +1,51 @@
-#!/bin/sh
+#!/bin/bash
 
 MDIR=/lib/modules/`uname -r`/lustre
+/bin/rm -rf $MDIR
 mkdir -p $MDIR
 
-KVER=24
-EXT=o
-FSFLT=fsfilt_ext3
-MODFILE="/etc/modules.conf"
-if [ `uname -r | cut -c 3` -eq 6 ]; then
-    KVER=26
-    EXT=ko
-    FSFLT=fsfilt_ldiskfs
+EXT=ko
+if [ -d /etc/modprobe.d ]; then
+    MODFILE="/etc/modprobe.d/Lustre"
+else
     MODFILE="/etc/modprobe.conf"
 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 ../../libcfs/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 ../../lnet/tests/pingcli.$EXT $MDIR
+cp -u ../../lnet/tests/pingsrv.$EXT $MDIR
+cp -u ../mgs/mgs.$EXT $MDIR
+cp -u ../quota/lquota.$EXT $MDIR
+cp -u ../quota/quotacheck_test.$EXT $MDIR
+cp -u ../quota/quotactl_test.$EXT $MDIR
 cp -u ../ptlrpc/ptlrpc.$EXT $MDIR
-cp -u ../mdc/mdc.$EXT $MDIR
-cp -u ../osc/osc.$EXT $MDIR
+cp -u ../ptlrpc/gss/ptlrpc_gss.$EXT $MDIR
+cp -u ../fld/fld.$EXT $MDIR
 cp -u ../lov/lov.$EXT $MDIR
+cp -u ../mdc/mdc.$EXT $MDIR
+cp -u ../llite/lustre.$EXT $MDIR
+cp -u ../obdclass/llog_test.$EXT $MDIR
+cp -u ../obdclass/obdclass.$EXT $MDIR
+cp -u ../mdt/mdt.$EXT $MDIR
+cp -u ../fid/fid.$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 ../osd/osd.$EXT $MDIR
+cp -u ../obdecho/obdecho.$EXT $MDIR
 cp -u ../obdfilter/obdfilter.$EXT $MDIR
-cp -u ../llite/lustre.$EXT $MDIR
+cp -u ../cmm/cmm.$EXT $MDIR
+[ $KVER == "26" ] && cp -u ../../ldiskfs/ldiskfs/ldiskfs.$EXT $MDIR
+cp -u ../lvfs/quotafmt_test.$EXT $MDIR
+cp -u ../mdd/mdd.$EXT $MDIR
+cp -u ../osc/osc.$EXT $MDIR
+cp -u ../ost/ost.$EXT $MDIR
 cp -u ../mgc/mgc.$EXT $MDIR
-cp -u ../mgs/mgs.$EXT $MDIR
-cp -u ../quota/lquota.$EXT $MDIR
-cp -u ../obdecho/obdecho.$EXT $MDIR
+cp -u ../lvfs/$FSFLT.$EXT $MDIR
+cp -u ../lvfs/lvfs.$EXT $MDIR
+cp -u ../lmv/lmv.$EXT $MDIR
 
 # prevent warnings on my uml
 rm -f /lib/modules/`uname -r`/modules.*
@@ -43,6 +54,8 @@ depmod -A -e
 
 echo "Copying mount from local build dir to "$MDIR
 cp -u ../utils/mount.lustre /sbin/.
+cp -u ../utils/l_getidentity /usr/sbin/.
+cp -u ../utils/lfs /usr/sbin/.
 
 MP="/sbin/modprobe"
 MPI="$MP --ignore-install"