qa/standalone/scrub/osd-scrub-repair: no -y to diff

With -y you can't see the entire line when it is long, which is
needed to identify the diff failure in
http://tracker.ceph.com/issues/21618

Instead, let the interactive user specify the option if they want it.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index f577835f8784f0cd4d27e585452ab5e5f8f0c52d..1fbf81ddcca9c8e5aa55b49b3175719c04240690 100755 (executable)
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -32,15 +32,9 @@ fi
 
 if [ `uname` = FreeBSD ]; then
     SED=gsed
-    DIFFCOLOPTS=""
     KERNCORE="kern.corefile"
 else
     SED=sed
-    termwidth=$(stty -a | head -1 | sed -e 's/.*columns \([0-9]*\).*/\1/')
-    if [ -n "$termwidth" -a "$termwidth" != "0" ]; then
-        termwidth="-W ${termwidth}"
-    fi
-    DIFFCOLOPTS="-y $termwidth"
     KERNCORE="kernel.core_pattern"
 fi