demos/base*.sh: don't insmod loop when it is not used

diff --git a/lustre/demos/baseclean.sh b/lustre/demos/baseclean.sh
index abe4d73..342599f 100755 (executable)
--- a/lustre/demos/baseclean.sh
+++ b/lustre/demos/baseclean.sh
@@ -23,8 +23,10 @@ if [ x$? = x0 ]; then
 fi
 
 
-[ "$LOOPDEV" ] && losetup -d $LOOPDEV
-rmmod loop > /dev/null 2>&1
+if [ "$LOOPDEV" ]; then
+    losetup -d $LOOPDEV
+    rmmod loop > /dev/null 2>&1
+fi
 
 if [ "$TMPFILE" -a -f "$TMPFILE" ]; then
     rm -i $TMPFILE

diff --git a/lustre/demos/basesetup.sh b/lustre/demos/basesetup.sh
index b5796ec..c301630 100755 (executable)
--- a/lustre/demos/basesetup.sh
+++ b/lustre/demos/basesetup.sh
@@ -23,17 +23,19 @@ fi
 
 
 # loop device
-insmod loop > /dev/null 2>&1
-if [ "$LOOPDEV" -a "`losetup $LOOPDEV 2> /dev/null`" ]; then
-    echo "It appears that $LOOPDEV is in use.  Unable to continue" 1>&2
-    echo "You need to clean up $LOOPDEV (via cleanup.sh),"
-    echo "or you can change which device is used in demos/config.sh" 1>&2
-    # undo previous
-    [ "$TMPFILE" ] && rm $TMPFILE
-    exit 2
+if [ "$LOOPDEV" ]; then
+    insmod loop > /dev/null 2>&1
+    if [ -a "`losetup $LOOPDEV 2> /dev/null`" ]; then
+       echo "It appears that $LOOPDEV is in use.  Unable to continue" 1>&2
+       echo "You need to clean up $LOOPDEV (via cleanup.sh),"
+       echo "or you can change which device is used in demos/config.sh" 1>&2
+       # undo previous
+       [ "$TMPFILE" ] && rm $TMPFILE
+       exit 2
+    fi
+    losetup $LOOPDEV $TMPFILE
 fi
 
-[ "$LOOPDEV" ] && losetup $LOOPDEV $TMPFILE
 # Ensure that we have the correct devices for OBD to work
 [ ! -c /dev/obd0 ] && mknod /dev/obd0 c $OBDMAJ 0
 [ ! -c /dev/obd1 ] && mknod /dev/obd1 c $OBDMAJ 1
@@ -41,7 +43,7 @@ fi
 
 
 if [ "$BASEDEV" ]; then
-    mke2fs -b 4096 $BASEDEV
+    mke2fs -r 0 -b 4096 $BASEDEV
 else
     echo "\$BASEDEV not defined in demos/config.sh.  Please fix!"
     [ "$LOOPDEV" ] && losetup -d $LOOPDEV