setup the out file according to enabled mount options (dquots permute the

logprint output when any form of quota is enabled).

018

@@ -117,7 +117,7 @@ _require_scratch
 
 echo "*** init FS"
 
-rm -f $seq.full
+rm -f $seq.out $seq.full
 umount $SCRATCH_DEV >/dev/null 2>&1
 
 _full "mkfs"
@@ -126,7 +126,17 @@ mkfs -t xfs -f $SCRATCH_DEV                 >>$seq.full 2>&1 \
 _full " mount"
 mount -t xfs $SCRATCH_DEV $SCRATCH_MNT      >>$seq.full 2>&1 \
     || _fail "mount failed"
-    
+
+if src/feature -U $SCRATCH_DEV
+then
+	ln $seq.usrquota $seq.out
+elif src/feature -G $SCRATCH_DEV
+then
+	ln $seq.grpquota $seq.out
+else
+	ln $seq.noquota $seq.out
+fi
+
 # generate some log traffic - but not too much - life gets a little
 # more complicated if the log wraps around. This traffic is
 # pretty much arbitary, but could probably be made better than this.

050

@@ -89,16 +89,16 @@ then
 	_notrun "XFS quota not enabled"
 elif src/feature -u $SCRATCH_DEV
 then
-	type=u ; id=`_choose_uid`; ln -s $seq.usrquota $seq.out
+	type=u ; id=`_choose_uid`; ln $seq.usrquota $seq.out
 elif src/feature -g $SCRATCH_DEV
 then
-	type=g ; id=`_choose_gid`; ln -s $seq.grpquota $seq.out
+	type=g ; id=`_choose_gid`; ln $seq.grpquota $seq.out
 elif src/feature -U $SCRATCH_DEV
 then
-	type=u ; id=`_choose_uid`; ln -s $seq.uqnoenforce $seq.out
+	type=u ; id=`_choose_uid`; ln $seq.uqnoenforce $seq.out
 elif src/feature -G $SCRATCH_DEV
 then
-	type=g ; id=`_choose_gid`; ln -s $seq.gqnoenforce $seq.out
+	type=g ; id=`_choose_gid`; ln $seq.gqnoenforce $seq.out
 else
 	_notrun "No quota support at mount time"
 fi