linux-ext4 - Re: [PATCH] mke2fs: remove quota docs if not configured in

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <51FBD4C1.9060106@redhat.com>
Date:	Fri, 02 Aug 2013 10:48:17 -0500
From:	Eric Sandeen <sandeen@...hat.com>
To:	ext4 development <linux-ext4@...r.kernel.org>
CC:	Bert.Deknuydt@...t.kuleuven.be
Subject: Re: [PATCH] mke2fs: remove quota docs if not configured in

On 11/28/12 11:47 PM, Eric Sandeen wrote:
> If quota isn't turned on with --enable-quota, then comment
> quota documentation out of the mke2fs manpage.
> 
> Signed-off-by: Eric Sandeen <sandeen@...hat.com>
> ---
> 
> first time I've mucked with subst, dunno if this is right
> but it seems to work :)

Going through old patches - ping on this one?

-Eric

> 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.
> +@...TA_MAN_COMMENT@.TP
> +@...TA_MAN_COMMENT@.BI quotatype
> +@...TA_MAN_COMMENT@...cify which quota type ('usr' or 'grp') is to be initialized. This
> +@...TA_MAN_COMMENT@...ion has any effect only if
> +@...TA_MAN_COMMENT@.B quota
> +@...TA_MAN_COMMENT@...ture is set. Without this extended option, the default behavior is to
> +@...TA_MAN_COMMENT@...tialize 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.
> +@...TA_MAN_COMMENT@.TP
> +@...TA_MAN_COMMENT@.B quota
> +@...TA_MAN_COMMENT@...ate quota inodes (inode# 3 for userquota and inode# 4 for group quota) and
> +@...TA_MAN_COMMENT@set them in the superblock.  With this feature, the quotas will be enabled
> +@...TA_MAN_COMMENT@...omatically 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@
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html