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

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index 40bbf16..de20003 100755
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -1,61 +1,34 @@
 #!/bin/sh
+# suggested boilerplate for test script
 
-SRCDIR="`dirname $0`"
-. $SRCDIR/common.sh
-
-mknod /dev/portals c 10 240
-
-insmod $R/usr/src/portals/linux/oslib/portals.o
-insmod $R/usr/src/portals/linux/socknal/ksocknal.o
-
-$R/usr/src/portals/linux/utils/acceptor 1234 &
-
-insmod $R/usr/src/obd/rpc/ptlrpc.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
-
-$R/usr/src/portals/linux/utils/ptlctl <<EOF
-mynid
-setup tcp
-connect localhost 1234
-add_uuid self
-add_uuid mds
-add_uuid ost
-quit
-EOF
-
-dd if=/dev/zero of=/tmp/ost bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/ost
-losetup ${LOOP}0 /tmp/ost
-
-dd if=/dev/zero of=/tmp/mds bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/mds
-losetup ${LOOP}1 /tmp/mds
-
-mknod /dev/obd c 10 241
-echo 8291 > /proc/sys/obd/debug
-echo 8291 > /proc/sys/obd/trace
-
-$R/usr/src/obd/utils/obdctl <<EOF
-device 0
-attach mds
-setup ${LOOP}1 ext2
-device 1
-attach obdext2
-setup ${LOOP}0
-device 2
-attach ost
-setup 1
-device 3
-attach osc
-setup
-quit
-EOF
-
-mkdir /mnt/obd
-mount -t lustre_light -o device=3 none /mnt/obd
+LCONF=${LCONF:-../utils/lconf}
+NAME=${NAME:-local}
+
+config=$NAME.xml
+mkconfig=$NAME.sh
+
+if [ "$PORTALS" ]; then
+  portals_opt="--portals=$PORTALS"
+fi
+
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
+fi
+
+if [ "$LDAPURL" ]; then
+    conf_opt="--ldapurl $LDAPURL --config $NAME"
+else
+    sh $mkconfig $config || exit 1
+    conf_opt="$config"
+fi    
+
+[ "$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