mirror of
https://github.com/ceph/ceph
synced 2024-12-17 17:05:42 +00:00
Merge pull request #18079 from liewegas/wip-21618
qa/standalone/scrub/osd-scrub-repair: no -y to diff Reviewed-by: David Zafman <dzafman@redhat.com>
This commit is contained in:
commit
f26c3c79a6
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user