X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fllmount.sh;h=de200036f29602c8d9048df142c86871e08ab45f;hb=96ec6856f91f7f9031cfce4273c714d72cfe59ae;hp=703e10f55cfa6ae22fe1f236bfa3af5ff8337347;hpb=dfe6b1adaedec5d6c7ae7220c2dfaf8236631eca;p=fs%2Flustre-release.git

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index 703e10f..de20003 100755
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -1,44 +1,34 @@
 #!/bin/sh
+# suggested boilerplate for test script
 
-R=/r
+LCONF=${LCONF:-../utils/lconf}
+NAME=${NAME:-local}
 
-insmod /lib/modules/2.4.17/kernel/drivers/block/loop.o
-insmod $R/usr/src/obd/class/obdclass.o 
-insmod $R/usr/src/obd/ext2obd/obdext2.o
-insmod $R/usr/src/obd/ost/ost.o
-insmod $R/usr/src/obd/osc/osc.o
-insmod $R/usr/src/obd/mds/mds.o
-insmod $R/usr/src/obd/mdc/mdc.o
-insmod $R/usr/src/obd/llight/llight.o
+config=$NAME.xml
+mkconfig=$NAME.sh
 
-dd if=/dev/zero of=/tmp/ost bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/ost
-losetup /dev/loop/0 /tmp/ost
+if [ "$PORTALS" ]; then
+  portals_opt="--portals=$PORTALS"
+fi
 
-dd if=/dev/zero of=/tmp/mds bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/mds
-losetup /dev/loop/1 /tmp/mds
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
+fi
 
-mknod /dev/obd c 10 241
+if [ "$LDAPURL" ]; then
+    conf_opt="--ldapurl $LDAPURL --config $NAME"
+else
+    sh $mkconfig $config || exit 1
+    conf_opt="$config"
+fi    
 
-$R/usr/src/obd/utils/obdctl <<EOF
-device 0
-attach mds
-setup /dev/loop/1 ext2
-device 1
-attach obdext2
-setup /dev/loop/0
-device 2
-attach ost
-setup 1
-device 3
-attach osc
-setup 2
-quit
-EOF
-
-mkdir /mnt/obd
-mount -t lustre_light -o device=3 none /mnt/obd
+[ "$NODE" ] && node_opt="--node $NODE"
 
+if [ "$1" = "-v" ]; then
+  verbose="-v"
+fi
 
+[ -x $LCONF ] || chmod a+rx $LCONF
 
+${LCONF} $portals_opt $lustre_opt $node_opt --reformat --gdb \
+    $verbose $conf_opt  || exit 2