From patchwork Wed Jun 18 15:29:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 4377501 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F0427BEEAA for ; Wed, 18 Jun 2014 15:29:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2EF2020306 for ; Wed, 18 Jun 2014 15:29:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 612F4202FE for ; Wed, 18 Jun 2014 15:29:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752871AbaFRP3J (ORCPT ); Wed, 18 Jun 2014 11:29:09 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46547 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752198AbaFRP3H (ORCPT ); Wed, 18 Jun 2014 11:29:07 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id C5272ACB5; Wed, 18 Jun 2014 15:29:06 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 83226DA910; Wed, 18 Jun 2014 17:29:06 +0200 (CEST) Date: Wed, 18 Jun 2014 17:29:06 +0200 From: David Sterba To: Eric Sandeen Cc: dsterba@suse.cz, linux-btrfs , Karel Zak Subject: Re: [PATCH V2] btrfs-progs: add mount options to btrfs-mount.5 Message-ID: <20140618152906.GW1903@twin.jikos.cz> Reply-To: dsterba@suse.cz Mail-Followup-To: dsterba@suse.cz, Eric Sandeen , linux-btrfs , Karel Zak References: <5398D475.4070309@redhat.com> <5398D4DF.9080508@redhat.com> <20140612105151.GN1903@twin.jikos.cz> <5399BB92.2070205@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5399BB92.2070205@redhat.com> User-Agent: Mutt/1.5.22.1-rc1 (2013-10-16) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Jun 12, 2014 at 09:39:14AM -0500, Eric Sandeen wrote: > > So what if the mount options are generated from btrfs-mount.txt but > > installed under btrfs.5.gz name? If there are more section 5 manpages we > > can make it more generic but for now hardcoding btrfs-mount.* -> > > btrfs.5. sounds ok to me. > > Yeah, that seemed like kind of nasty hard-coding, but I suppose it works > for now. I wanted to make it more generic, I didn't have a better idea.. Added: So the MAN5 code is generic, the exception is only at the installation time. --- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -85,6 +85,9 @@ install-man: man $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir) $(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir) + # the source file name of btrfs.5 clashes with section 8 page, but we + # want to keep the code generic + mv $(DESTDIR)$(man5dir)/btrfs-mount.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir) $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz