View | Details | Raw Unified | Return to bug 203707 | Differences between
and this patch

Collapse All | Expand All

(-)usr.sbin/makefs/makefs.8 (+4 lines)
Lines 53-58 Link Here
53 
.Op Fl m Ar maximum-size
 53 
.Op Fl m Ar maximum-size
54 
.Op Fl N Ar userdb-dir
 54 
.Op Fl N Ar userdb-dir
55 
.Op Fl o Ar fs-options
 55 
.Op Fl o Ar fs-options
56 
.Op Fl r Ar roundup
56 
.Op Fl S Ar sector-size
 57 
.Op Fl S Ar sector-size
57 
.Op Fl s Ar image-size
 58 
.Op Fl s Ar image-size
58 
.Op Fl t Ar fs-type
 59 
.Op Fl t Ar fs-type
Lines 195-200 Link Here
195 
See the
 196 
See the
196 
.Fl Z
 197 
.Fl Z
197 
flag.
 198 
flag.
199 
.It Fl r Ar roundup
200 
Round the image up to specified block size that should be multiple
201 
of block size.
198 
.It Fl S Ar sector-size
 202 
.It Fl S Ar sector-size
199 
Set the file system sector size to
 203 
Set the file system sector size to
200 
.Ar sector-size .
 204 
.Ar sector-size .
(-)usr.sbin/makefs/makefs.h (+1 lines)
Lines 130-135 Link Here
130 
	int	needswap;	/* non-zero if byte swapping needed */
 130 
	int	needswap;	/* non-zero if byte swapping needed */
131 
	int	sectorsize;	/* sector size */
 131 
	int	sectorsize;	/* sector size */
132 
	int	sparse;		/* sparse image, don't fill it with zeros */
 132 
	int	sparse;		/* sparse image, don't fill it with zeros */
133 
	off_t	roundup;	/* round image size up to this value */
133 

          134
          

        

        

          134
          
	void	*fs_specific;	/* File system specific additions. */

          135
          
	void	*fs_specific;	/* File system specific additions. */

        

        

          135
          
} fsinfo_t;

          136
          
} fsinfo_t;

        



(-)usr.sbin/makefs/makefs.c
      (-4 / +10 lines)




  

    
      
            Lines 113-119
          main(int argc, char *argv[])
      
      
        Link Here
      
    
  

        

          113
          
	start_time.tv_sec = start.tv_sec;

          113
          
	start_time.tv_sec = start.tv_sec;

        

        

          114
          
	start_time.tv_nsec = start.tv_usec * 1000;

          114
          
	start_time.tv_nsec = start.tv_usec * 1000;

        

        

          115
          

          115
          

        

          
            

              116
              
	while ((ch = getopt(argc, argv, "B:b:Dd:f:F:M:m:N:o:ps:S:t:xZ")) != -1) {


              116
              
	while ((ch = getopt(argc, argv, "B:b:Dd:f:F:M:m:N:o:pr:s:S:t:xZ")) != -1) {

            

        

          117
          
		switch (ch) {

          117
          
		switch (ch) {

        

        

          118
          

          118
          

        

        

          119
          
		case 'B':

          119
          
		case 'B':

        

  

    
      
            Lines 209-214
          main(int argc, char *argv[])
      
      
        Link Here
      
    
  

        

          209
          
			fsoptions.sparse = 1;

          209
          
			fsoptions.sparse = 1;

        

        

          210
          
			break;

          210
          
			break;

        

        

          211
          

          211
          

        

            

              
              
              212
              
		case 'r':

            

            

              213
              
			/* Round image size up to specified block size */

            

            

              214
              
			fsoptions.roundup =

            

            

              215
              
			    strsuftoll("roundup", optarg, 0, LLONG_MAX);

            

            

              216
              
			break;

            

            

              217
              

            

        

          212
          
		case 's':

          218
          
		case 's':

        

        

          213
          
			fsoptions.minsize = fsoptions.maxsize =

          219
          
			fsoptions.minsize = fsoptions.maxsize =

        

        

          214
          
			    strsuftoll("size", optarg, 1LL, LLONG_MAX);

          220
          
			    strsuftoll("size", optarg, 1LL, LLONG_MAX);

        

  

    
      
            Lines 359-367
          usage(void)
      
      
        Link Here
      
    
  

        

          359
          
	prog = getprogname();

          365
          
	prog = getprogname();

        

        

          360
          
	fprintf(stderr,

          366
          
	fprintf(stderr,

        

        

          361
          
"usage: %s [-t fs-type] [-o fs-options] [-d debug-mask] [-B endian]\n"

          367
          
"usage: %s [-t fs-type] [-o fs-options] [-d debug-mask] [-B endian]\n"

        

          
            

              362
              
"\t[-S sector-size] [-M minimum-size] [-m maximum-size] [-s image-size]\n"


              368
              
"\t[-S sector-size] [-M minimum-size] [-m maximum-size] [-r roundup ]\n"

            

            

              363
              
"\t[-b free-blocks] [-f free-files] [-F mtree-specfile] [-xZ]\n"


              369
              
"\t[-s image-size] [-b free-blocks] [-f free-files] [-F mtree-specfile]\n"

            

            

              364
              
"\t[-N userdb-dir] image-file directory | manifest [extra-directory ...]\n",


              370
              
"\t[-xZ] [-N userdb-dir] image-file directory | manifest [extra-directory ...]\n",

            

        

          365
          
	    prog);

          371
          
	    prog);

        

        

          366
          
	exit(1);

          372
          
	exit(1);

        

        

          367
          
}

          373
          
}

        






  

  Return to bug 203707