Updates for Debian, devfs, and the device command.

diff --git a/lustre/demos/basesetup.sh b/lustre/demos/basesetup.sh
index c301630..86bdd97 100755 (executable)
--- a/lustre/demos/basesetup.sh
+++ b/lustre/demos/basesetup.sh
@@ -8,7 +8,13 @@ OBDDIR="`dirname $0`/.."
 # module configuration
 if [ "$MODCONF" -a -f $MODCONF ]; then
     if [ -z "`grep -i "alias  *char-major-$OBDMAJ  *obdclass" $MODCONF`" ]; then
-         echo "alias char-major-${OBDMAJ} obdclass" >>$MODCONF
+       if [ -d /etc/modutils ]; then
+           # Debian-style modules configuration.
+           echo "alias char-major-${OBDMAJ} obdclass" > /etc/modutils/obd
+           update-modules
+       else
+           echo "alias char-major-${OBDMAJ} obdclass" >>$MODCONF
+       fi
     fi
 fi
 

diff --git a/lustre/demos/config.sh b/lustre/demos/config.sh
index 51f4df5..96d074d 100644 (file)
--- a/lustre/demos/config.sh
+++ b/lustre/demos/config.sh
@@ -15,7 +15,8 @@ OBDMAJ=186
 # If TMPFILE is empty (""), then no temporary file will be created for loop.
 [ "$TMPFILE" ] || TMPFILE="/tmp/obdfs.tmpfile"
 [ "$TMPSIZE" ] || TMPSIZE=10240
-LOOPDEV="/dev/loop0"
+[ -b /dev/loop/0 ] && LOOPDEV=/dev/loop/0
+[ -z "$LOOPDEV" -a -b /dev/loop0 ] && LOOPDEV="/dev/loop0"
 
 # If LOOPDEV is empty, then it is assumed that BASEDEV is a real block device
 # that doesn't mind being overwritten - don't use a partition with data on it!!

diff --git a/lustre/demos/obdfsclean.sh b/lustre/demos/obdfsclean.sh
index 6a888a7..a001c5e 100755 (executable)
--- a/lustre/demos/obdfsclean.sh
+++ b/lustre/demos/obdfsclean.sh
@@ -9,6 +9,7 @@ plog rmmod obdfs
 
 plog log "CLEANUP/DETACH"
 $OBDDIR/class/obdcontrol -f << EOF
+device /dev/obd0
 cleanup
 detach
 quit

diff --git a/lustre/demos/obdfssetup.sh b/lustre/demos/obdfssetup.sh
index 81ca302..46dcc2b 100755 (executable)
--- a/lustre/demos/obdfssetup.sh
+++ b/lustre/demos/obdfssetup.sh
@@ -17,6 +17,7 @@ fi
 
 plog log "ATTACHING /dev/obd0, SETUP $BASEDEV"
 $OBDDIR/class/obdcontrol -f << EOF
+device /dev/obd0
 attach obdext2
 setup $BASEDEV
 quit