summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e0015c9)
Merge of master-melb:xfs-cmds:27847a by kenmcd.
changed _dmapi_scratch_mount to determine dmapi support by attempting to mount the filesystem with the dmapi mount option and checking it succeeds
DMAPI_LS_TO_COPY_PATH=$DMAPI_QASUITE2_DIR/bindir/ls_to_copy
_dmapi_scratch_mount () {
DMAPI_LS_TO_COPY_PATH=$DMAPI_QASUITE2_DIR/bindir/ls_to_copy
_dmapi_scratch_mount () {
- if [ `lsmod | grep -c dmapi` -gt 0 ] ; then
- if [ `echo "$MOUNT_OPTIONS" | grep -c dmapi` -gt 0 -o \
- `echo "$MOUNT_OPTIONS" | grep -c dmi` -gt 0 ] ; then
- #already got dmapi options set
- _scratch_mount
- else
- _scratch_mount "-o dmapi,mtpt=$SCRATCH_MNT"
- fi
+ if [ `echo "$MOUNT_OPTIONS" | grep -c dmapi` -gt 0 -o \
+ `echo "$MOUNT_OPTIONS" | grep -c dmi` -gt 0 ] ; then
+ #already got dmapi options set
+ _scratch_mount
+ dmapi_mount_result=$?
- _notrun "DMAPI modules not loaded"
+ _scratch_mount "-o dmapi,mtpt=$SCRATCH_MNT"
+ dmapi_mount_result=$?
+
+ if [ $dmapi_mount_result -ne 0 ] ; then
+ _notrun "Assuming DMAPI modules are not loaded"
+ fi
+}
\ No newline at end of file