QA updates

diff --git a/common.rc b/common.rc
index 0d4322fdf543e6d0cdb0deb568f72b4fb98ee222..2dc706d888f77c714468d89be9783bc56ad8df4b 100644 (file)
--- a/common.rc
+++ b/common.rc
@@ -666,8 +666,13 @@ then
         # $TEST_DEV is not mounted
         if ! _test_mount
         then
-            echo "common.rc: could not mount $TEST_DEV on $TEST_DIR"
-            exit 1
+            echo "common.rc: retrying test device mount with external set"
+            [ "$USE_EXTERNAL" != "yes" ] && USE_EXTERNAL=yes
+            if ! _test_mount
+            then
+                echo "common.rc: could not mount $TEST_DEV on $TEST_DIR"
+                exit 1
+            fi
         fi
     fi
     

diff --git a/configure.in b/configure.in
index b545b03bd39712e564863e0745dd1481df3d4f4b..56150c99d848a192301445fb17bef69e86ac7441 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,6 @@ AC_PACKAGE_NEED_UUIDCOMPARE
 
 AC_PACKAGE_NEED_XFS_LIBXFS_H
 AC_PACKAGE_NEED_XFSCTL_MACRO
-AC_PACKAGE_NEED_LIBXFSINIT_LIBXFS
 AC_PACKAGE_NEED_XFS_HANDLE_H
 AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE
 

diff --git a/setup b/setup
index 51c941aa45d629796d74afc1f37cc116362e502e..f3cfb46393dd6c1631b024d5a6b1573ec0d69605 100755 (executable)
--- a/setup
+++ b/setup
@@ -6,11 +6,12 @@ then
     exit 1
 fi
 
-use="(external=no)"
-[ "$USE_EXTERNAL" = yes ] && use="(external=yes)"
+[ "$USE_EXTERNAL" != yes ] && USE_EXTERNAL="no"
+[ "$USE_LBD_PATCH" = yes ] || USE_LBD_PATCH="no"
 
 cat <<EOF
 TEST: DIR=$TEST_DIR DEV=$TEST_DEV rt=[$TEST_RTDEV] log=[$TEST_LOGDEV]
 TAPE: dev=[$TAPE_DEV] rmt=[$RMT_TAPE_DEV] rmtirix=[$RMT_TAPE_USER@$RMT_IRIXTAPE_DEV]
-SCRATCH: MNT=$SCRATCH_MNT DEV=$SCRATCH_DEV rt=[$SCRATCH_RTDEV] log=[$SCRATCH_LOGDEV]  $use
+SCRATCH: MNT=$SCRATCH_MNT DEV=$SCRATCH_DEV rt=[$SCRATCH_RTDEV] log=[$SCRATCH_LOGDEV]
+VARIABLES: external=$USE_EXTERNAL largeblk=$USE_LBD_PATCH
 EOF

diff --git a/src/Makefile b/src/Makefile
index 231456f8c4c1c2d0f93df96e98aa22ad4149496b..8488efeb12e43f469f9982c3556cdb46466df4ff 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -64,8 +64,8 @@ nametest: nametest.o $(LIBTEST)
 bstat: bstat.o $(LIBHANDLE)
        $(LINKTEST) $(LIBHANDLE) $(LDLIBS)
 
-loggen:        loggen.o $(LIBXFS)
-       $(LINKTEST) $(LIBXFS) $(LDLIBS)
+loggen:        loggen.o
+       $(LINKTEST) $(LDLIBS)
 
 acl_get: acl_get.o $(LIBACL) $(LIBATTR)
        $(LINKTEST) $(LIBACL) $(LIBATTR) $(LDLIBS)