All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Sandeen <sandeen@redhat.com>
To: ext4 development <linux-ext4@vger.kernel.org>
Cc: Bert.Deknuydt@esat.kuleuven.be
Subject: [PATCH] mke2fs: remove quota docs if not configured in
Date: Wed, 28 Nov 2012 23:47:51 -0600	[thread overview]
Message-ID: <50B6F707.60308@redhat.com> (raw)
In-Reply-To: <50B50804.6020309@redhat.com>

If quota isn't turned on with --enable-quota, then comment
quota documentation out of the mke2fs manpage.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

first time I've mucked with subst, dunno if this is right
but it seems to work :)

diff --git a/configure.in b/configure.in
index bc8d1e8..2d431bd 100644
--- a/configure.in
+++ b/configure.in
@@ -565,6 +565,8 @@ AC_SUBST(BLKID_CMT)
 dnl
 dnl handle --enable-quota
 dnl
+QUOTA_MAN_COMMENT='.\"'
+AC_SUBST(QUOTA_MAN_COMMENT)
 PKG_PROG_PKG_CONFIG
 AH_TEMPLATE([CONFIG_QUOTA], [Define to 1 to enable quota support])
 AC_ARG_ENABLE([quota],
@@ -575,6 +577,8 @@ then
 else
 	AC_DEFINE(CONFIG_QUOTA, 1)
 	AC_MSG_RESULT([Enabling quota support])
+	QUOTA_MAN_COMMENT=""
+	AC_SUBST(QUOTA_MAN_COMMENT)
 fi
 ,
 AC_MSG_RESULT([Disabling quota support by default])
diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
index d4fbe00..92cae74 100644
--- a/misc/mke2fs.8.in
+++ b/misc/mke2fs.8.in
@@ -275,13 +275,13 @@ as default.
 .TP
 .BI nodiscard
 Do not attempt to discard blocks at mkfs time.
-.TP
-.BI quotatype
-Specify which quota type ('usr' or 'grp') is to be initialized. This
-option has any effect only if
-.B quota
-feature is set. Without this extended option, the default behavior is to
-initialize both user and group quotas.
+@QUOTA_MAN_COMMENT@.TP
+@QUOTA_MAN_COMMENT@.BI quotatype
+@QUOTA_MAN_COMMENT@Specify which quota type ('usr' or 'grp') is to be initialized. This
+@QUOTA_MAN_COMMENT@option has any effect only if
+@QUOTA_MAN_COMMENT@.B quota
+@QUOTA_MAN_COMMENT@feature is set. Without this extended option, the default behavior is to
+@QUOTA_MAN_COMMENT@initialize both user and group quotas.
 .RE
 .TP
 .BI \-f " fragment-size"
@@ -555,11 +555,11 @@ option).
 .B large_file
 Filesystem can contain files that are greater than 2GB.  (Modern kernels
 set this feature automatically when a file > 2GB is created.)
-.TP
-.B quota
-Create quota inodes (inode# 3 for userquota and inode# 4 for group quota) and
-set them in the superblock.  With this feature, the quotas will be enabled
-automatically when the filesystem is mounted.
+@QUOTA_MAN_COMMENT@.TP
+@QUOTA_MAN_COMMENT@.B quota
+@QUOTA_MAN_COMMENT@Create quota inodes (inode# 3 for userquota and inode# 4 for group quota) and
+@QUOTA_MAN_COMMENT@set them in the superblock.  With this feature, the quotas will be enabled
+@QUOTA_MAN_COMMENT@automatically when the filesystem is mounted.
 .TP
 .B resize_inode
 Reserve space so the block group descriptor table may grow in the future.
diff --git a/util/subst.conf.in b/util/subst.conf.in
index 0e074d8..64fde7a 100644
--- a/util/subst.conf.in
+++ b/util/subst.conf.in
@@ -18,3 +18,5 @@ $prefix			@prefix@
 # Enable the documentation for the journal device mke2fs, tune2fs, and
 # e2fsck's man page
 JDEV			
+# Enable documentation for quota feature in mke2fs
+QUOTA_MAN_COMMENT	@QUOTA_MAN_COMMENT@


  parent reply	other threads:[~2012-11-29  5:48 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-27 18:21 [PATCH] e2fsprogs: fix configure help text for quota Eric Sandeen
2012-11-27 18:35 ` [PATCH] tune2fs: respect quota config option Eric Sandeen
2012-11-29  4:03   ` Theodore Ts'o
2012-11-29  5:47   ` Eric Sandeen [this message]
2013-08-02 15:48     ` [PATCH] mke2fs: remove quota docs if not configured in Eric Sandeen
2013-09-23 19:09       ` Eric Sandeen
2013-10-14 13:01     ` Theodore Ts'o
2012-11-29  4:03 ` [PATCH] e2fsprogs: fix configure help text for quota Theodore Ts'o
2012-11-29  5:50   ` Eric Sandeen
2012-11-29 13:55     ` Theodore Ts'o

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50B6F707.60308@redhat.com \
    --to=sandeen@redhat.com \
    --cc=Bert.Deknuydt@esat.kuleuven.be \
    --cc=linux-ext4@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.