Bug #21664: Bring back diff -y for non-FreeBSD - Ceph - Ceph

Actions

Copy link

Bug #21664

closed

Bring back diff -y for non-FreeBSD

Added by David Zafman over 6 years ago. Updated over 5 years ago.

Status:

Resolved

Priority:

Normal

Assignee:

David Zafman

Category:

Target version:

% Done:

Source:

Tags:

Backport:

luminous, mimic

Regression:

Severity:

3 - minor

Reviewed:

Affected Versions:

ceph-qa-suite:

Pull request ID:

Crash signature (v1):

Crash signature (v2):

Description

Create a diff function in ceph-helpers.sh for osd-scrub-repair.sh and osd-scrub-snaps.sh that will output both a diff and a diff -y if appropriate when there are differences.

Related issues 2 (0 open — 2 closed)

Actions

Copy link

Updated by David Zafman over 6 years ago

This was the code removed by Sage

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

Actions

Copy link