From patchwork Wed May 13 16:29:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Dickson X-Patchwork-Id: 11546825 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 10AEF739 for ; Wed, 13 May 2020 16:30:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 68CCC2064E for ; Wed, 13 May 2020 16:30:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VyWTH6pd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389431AbgEMQaK (ORCPT ); Wed, 13 May 2020 12:30:10 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:60649 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730731AbgEMQaK (ORCPT ); Wed, 13 May 2020 12:30:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589387407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Exm4qW0Af39SzPt80LsptZOAW+umrHL7Qe+EiZz4je4=; b=VyWTH6pd0crDy5jP4an0wsjQP6b6ar7NQe33yJp0VZKJevMP6W+t6EtpQfcweaLTpvGM/X N488oEETBDiaJU4oE8Ptrkj2sHRoPulJ1riUdcebv4JRjJyQSRHd6gCxTYtOe+iU5Ak3p5 vCGaB5s2syRBFNHDe3NYj78yGtXaqZ4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-207-IHuHKQgmOsSQPy6D40yBnw-1; Wed, 13 May 2020 12:29:53 -0400 X-MC-Unique: IHuHKQgmOsSQPy6D40yBnw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9266AEC1A9 for ; Wed, 13 May 2020 16:29:52 +0000 (UTC) Received: from madhat.boston.devel.redhat.com (ovpn-112-12.phx2.redhat.com [10.3.112.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50B8599D6 for ; Wed, 13 May 2020 16:29:52 +0000 (UTC) From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH] nfsdclddb: Redname clddb-tool to nfsdclddb Date: Wed, 13 May 2020 12:29:50 -0400 Message-Id: <20200513162950.186930-1-steved@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org To try to maintain some type of name convention rename clddb-tool to nfsdclddb Signed-off-by: Steve Dickson --- configure.ac | 2 +- tools/Makefile.am | 2 +- tools/{clddb-tool => nfsdclddb}/Makefile.am | 6 +++--- .../nfsdclddb.man} | 20 +++++++++---------- .../clddb-tool.py => nfsdclddb/nfsdclddb.py} | 0 5 files changed, 15 insertions(+), 15 deletions(-) rename tools/{clddb-tool => nfsdclddb}/Makefile.am (60%) rename tools/{clddb-tool/clddb-tool.man => nfsdclddb/nfsdclddb.man} (84%) rename tools/{clddb-tool/clddb-tool.py => nfsdclddb/nfsdclddb.py} (100%) diff --git a/configure.ac b/configure.ac index df88e58..0b1c8cc 100644 --- a/configure.ac +++ b/configure.ac @@ -695,7 +695,7 @@ AC_CONFIG_FILES([ tools/mountstats/Makefile tools/nfs-iostat/Makefile tools/nfsconf/Makefile - tools/clddb-tool/Makefile + tools/nfsdclddb/Makefile utils/Makefile utils/blkmapd/Makefile utils/nfsdcld/Makefile diff --git a/tools/Makefile.am b/tools/Makefile.am index 53e6117..432d35d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -9,7 +9,7 @@ endif OPTDIRS += nfsconf if CONFIG_NFSDCLD -OPTDIRS += clddb-tool +OPTDIRS += nfsdclddb endif SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat $(OPTDIRS) diff --git a/tools/clddb-tool/Makefile.am b/tools/nfsdclddb/Makefile.am similarity index 60% rename from tools/clddb-tool/Makefile.am rename to tools/nfsdclddb/Makefile.am index 15a8fd4..18263fb 100644 --- a/tools/clddb-tool/Makefile.am +++ b/tools/nfsdclddb/Makefile.am @@ -1,13 +1,13 @@ ## Process this file with automake to produce Makefile.in -PYTHON_FILES = clddb-tool.py +PYTHON_FILES = nfsdclddb.py -man8_MANS = clddb-tool.man +man8_MANS = nfsdclddb.man EXTRA_DIST = $(man8_MANS) $(PYTHON_FILES) all-local: $(PYTHON_FILES) install-data-hook: - $(INSTALL) -m 755 clddb-tool.py $(DESTDIR)$(sbindir)/clddb-tool + $(INSTALL) -m 755 nfsdclddb.py $(DESTDIR)$(sbindir)/nfsdclddb MAINTAINERCLEANFILES=Makefile.in diff --git a/tools/clddb-tool/clddb-tool.man b/tools/nfsdclddb/nfsdclddb.man similarity index 84% rename from tools/clddb-tool/clddb-tool.man rename to tools/nfsdclddb/nfsdclddb.man index e80b2c0..8ec7b18 100644 --- a/tools/clddb-tool/clddb-tool.man +++ b/tools/nfsdclddb/nfsdclddb.man @@ -1,20 +1,20 @@ .\" -.\" clddb-tool(8) +.\" nfsdclddb(8) .\" -.TH clddb-tool 8 "07 Aug 2019" +.TH nfsdclddb 8 "07 Aug 2019" .SH NAME -clddb-tool \- Tool for manipulating the nfsdcld sqlite database +nfsdclddb \- Tool for manipulating the nfsdcld sqlite database .SH SYNOPSIS -.B clddb-tool +.B nfsdclddb .RB [ \-h | \-\-help ] .P -.B clddb-tool +.B nfsdclddb .RB [ \-p | \-\-path .IR dbpath ] .B fix-table-names .RB [ \-h | \-\-help ] .P -.B clddb-tool +.B nfsdclddb .RB [ \-p | \-\-path .IR dbpath ] .B downgrade-schema @@ -22,7 +22,7 @@ clddb-tool \- Tool for manipulating the nfsdcld sqlite database .RB [ \-v | \-\-version .IR to-version ] .P -.B clddb-tool +.B nfsdclddb .RB [ \-p | \-\-path .IR dbpath ] .B print @@ -31,10 +31,10 @@ clddb-tool \- Tool for manipulating the nfsdcld sqlite database .P .SH DESCRIPTION -.RB "The " clddb-tool " command is provided to perform some manipulation of the nfsdcld sqlite database schema and to print the contents of the database." +.RB "The " nfsdclddb " command is provided to perform some manipulation of the nfsdcld sqlite database schema and to print the contents of the database." .SS Sub-commands Valid -.B clddb-tool +.B nfsdclddb subcommands are: .IP "\fBfix-table-names\fP" .RB "A previous version of " nfsdcld "(8) contained a bug that corrupted the reboot epoch table names. This sub-command will fix those table names." @@ -66,7 +66,7 @@ The schema version to downgrade to. Currently the schema can only be downgraded Do not list the clients in the reboot epoch tables in the output. .SH NOTES The -.B clddb-tool +.B nfsdclddb command will not allow the .B fix-table-names or diff --git a/tools/clddb-tool/clddb-tool.py b/tools/nfsdclddb/nfsdclddb.py similarity index 100% rename from tools/clddb-tool/clddb-tool.py rename to tools/nfsdclddb/nfsdclddb.py