Attachment 162260 Details for Bug 203707 – option -r replaced with -R

[patch] option -r replaced with -R

makefs.diff (text/plain), 2.90 KB, created by Eugene Grosbein on 2015-10-20 19:15:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eugene Grosbein

Created: 2015-10-20 19:15:19 UTC

Size: 2.90 KB

patch

obsolete

>--- usr.sbin/makefs/makefs.8.orig	2015-08-16 12:54:05.863499000 +0700
>+++ usr.sbin/makefs/makefs.8	2015-10-12 02:16:15.570648000 +0700
>@@ -53,6 +53,7 @@
> .Op Fl m Ar maximum-size
> .Op Fl N Ar userdb-dir
> .Op Fl o Ar fs-options
>+.Op Fl R Ar roundup
> .Op Fl S Ar sector-size
> .Op Fl s Ar image-size
> .Op Fl t Ar fs-type
>@@ -195,6 +196,9 @@
> See the
> .Fl Z
> flag.
>+.It Fl R Ar roundup
>+Round the image up to specified block size that should be multiple
>+of block size.
> .It Fl S Ar sector-size
> Set the file system sector size to
> .Ar sector-size .
>--- usr.sbin/makefs/makefs.h.orig	2015-10-12 01:55:14.796143000 +0700
>+++ usr.sbin/makefs/makefs.h	2015-10-12 02:07:39.208513000 +0700
>@@ -130,6 +130,7 @@
> 	int	needswap;	/* non-zero if byte swapping needed */
> 	int	sectorsize;	/* sector size */
> 	int	sparse;		/* sparse image, don't fill it with zeros */
>+	off_t	roundup;	/* round image size up to this value */
> 
> 	void	*fs_specific;	/* File system specific additions. */
> } fsinfo_t;
>--- usr.sbin/makefs/makefs.c.orig	2015-08-16 12:54:05.529323000 +0700
>+++ usr.sbin/makefs/makefs.c	2015-10-12 02:09:08.493909000 +0700
>@@ -113,7 +113,7 @@ main(int argc, char *argv[])
> 	start_time.tv_sec = start.tv_sec;
> 	start_time.tv_nsec = start.tv_usec * 1000;
> 
>-	while ((ch = getopt(argc, argv, "B:b:Dd:f:F:M:m:N:o:ps:S:t:xZ")) != -1) {
>+	while ((ch = getopt(argc, argv, "B:b:Dd:f:F:M:m:N:o:pR:s:S:t:xZ")) != -1) {
> 		switch (ch) {
> 
> 		case 'B':
>@@ -209,6 +209,12 @@ main(int argc, char *argv[])
> 			fsoptions.sparse = 1;
> 			break;
> 
>+		case 'R':
>+			/* Round image size up to specified block size */
>+			fsoptions.roundup =
>+			    strsuftoll("roundup", optarg, 0, LLONG_MAX);
>+			break;
>+
> 		case 's':
> 			fsoptions.minsize = fsoptions.maxsize =
> 			    strsuftoll("size", optarg, 1LL, LLONG_MAX);
>@@ -359,9 +365,9 @@ usage(void)
> 	prog = getprogname();
> 	fprintf(stderr,
> "usage: %s [-t fs-type] [-o fs-options] [-d debug-mask] [-B endian]\n"
>-"\t[-S sector-size] [-M minimum-size] [-m maximum-size] [-s image-size]\n"
>-"\t[-b free-blocks] [-f free-files] [-F mtree-specfile] [-xZ]\n"
>-"\t[-N userdb-dir] image-file directory | manifest [extra-directory ...]\n",
>+"\t[-S sector-size] [-M minimum-size] [-m maximum-size] [-R roundup ]\n"
>+"\t[-s image-size] [-b free-blocks] [-f free-files] [-F mtree-specfile]\n"
>+"\t[-xZ] [-N userdb-dir] image-file directory | manifest [extra-directory ...]\n",
> 	    prog);
> 	exit(1);
> }
>--- usr.sbin/makefs/ffs.c.orig	2015-10-12 02:38:06.928132000 +0700
>+++ usr.sbin/makefs/ffs.c	2015-10-12 03:51:16.714169000 +0700
>@@ -410,6 +410,10 @@ ffs_validate(const char *dir, fsnode *ro
> 		/* round up to the next block */
> 	fsopts->size = roundup(fsopts->size, ffs_opts->bsize);
> 
>+		/* round up to requested block size, if any */
>+	if (fsopts->roundup > 0)
>+		fsopts->size = roundup(fsopts->size, fsopts->roundup);
>+
> 		/* calculate density if necessary */
> 	if (ffs_opts->density == -1)
> 		ffs_opts->density = fsopts->size / fsopts->inodes + 1;

Actions: View | Diff

Attachments on bug 203707: 161924 | 161926 | 162260