From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:51726 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932634AbeEHQrG (ORCPT ); Tue, 8 May 2018 12:47:06 -0400 Subject: Re: [PATCH 4/4] fsck: fix more bashisms References: <152579743411.10641.4577883761846454290.stgit@magnolia> <152579746659.10641.17574404294067266121.stgit@magnolia> From: Eric Sandeen Message-ID: <09781e52-0a04-6eb7-54e2-499b37df3b59@redhat.com> Date: Tue, 8 May 2018 11:47:04 -0500 MIME-Version: 1.0 In-Reply-To: <152579746659.10641.17574404294067266121.stgit@magnolia> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org On 5/8/18 11:37 AM, Darrick J. Wong wrote: > From: Darrick J. Wong > > command -v is a bashism, so we need to get rid of it. The shell returns > an error code of 127 if it couldn't invoke xfs_repair, so teach > repair2fsck_code to deal with this. > > Signed-off-by: Darrick J. Wong seems straightforward, thanks. Reviewed-by: Eric Sandeen > --- > fsck/xfs_fsck.sh | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > > diff --git a/fsck/xfs_fsck.sh b/fsck/xfs_fsck.sh > index 1916c07e..6af0f224 100755 > --- a/fsck/xfs_fsck.sh > +++ b/fsck/xfs_fsck.sh > @@ -20,6 +20,10 @@ repair2fsck_code() { > ;; > 4) return 1 # The fs has been fixed > ;; > + 127) > + echo "$NAME error: xfs_repair was not found!" 1>&2 > + return 4 > + ;; > *) echo "$NAME error: An unknown return code from xfs_repair '$1'" 1>&2 > return 4 # something went wrong with xfs_repair > esac > @@ -59,13 +63,7 @@ if [ -n "$PS1" -o -t 0 ]; then > fi > > if $FORCE; then > - XFS_REPAIR=`command -v xfs_repair` > - if [ ! -x "$XFS_REPAIR" ] ; then > - echo "$NAME error: xfs_repair was not found!" 1>&2 > - exit 4 > - fi > - > - $XFS_REPAIR -e $DEV > + xfs_repair -e $DEV > repair2fsck_code $? > exit $? > fi >