From 15b63d6795585cc54b28ef9a0fa3b5b1fbade13c Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Mon, 2 Oct 2017 08:23:11 -0500
Subject: [PATCH] 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>
---
 qa/standalone/ceph-helpers.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index f577835f8784f..1fbf81ddcca9c 100755
--- 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
 
-- 
2.39.5