X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fmkfs.c;h=07eefb2735cfd3865c2032c392d8f2cc83a05c91;hp=911fad3dadca432d49a3a6092e036496593020dd;hb=91324e0a732fe592f2eecd5b541c731bf4f34b74;hpb=0710326ac5f1a06cf1dc3500617d04cf4cba5631

diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index 911fad3..07eefb2 100644
--- a/daemon/mkfs.c
+++ b/daemon/mkfs.c
@@ -33,10 +33,10 @@
 
 /* Takes optional arguments, consult optargs_bitmask. */
 int
-do_mkfs_opts (const char *fstype, const char *device, int blocksize)
+do_mkfs_opts (const char *fstype, const char *device, int blocksize, const char *features)
 {
   const char *argv[MAX_ARGS];
-  size_t i = 0, j;
+  size_t i = 0;
   char blocksize_str[32];
   int r;
   char *err;
@@ -115,6 +115,11 @@ do_mkfs_opts (const char *fstype, const char *device, int blocksize)
     }
   }
 
+  if (optargs_bitmask & GUESTFS_MKFS_OPTS_FEATURES_BITMASK) {
+     argv[i++] = "-O";
+     argv[i++] = features;
+  }
+
   argv[i++] = device;
   argv[i++] = NULL;
 
@@ -136,12 +141,12 @@ int
 do_mkfs (const char *fstype, const char *device)
 {
   optargs_bitmask = 0;
-  return do_mkfs_opts (fstype, device, 0);
+  return do_mkfs_opts (fstype, device, 0, 0);
 }
 
 int
 do_mkfs_b (const char *fstype, int blocksize, const char *device)
 {
   optargs_bitmask = GUESTFS_MKFS_OPTS_BLOCKSIZE_BITMASK;
-  return do_mkfs_opts (fstype, device, blocksize);
+  return do_mkfs_opts (fstype, device, blocksize, 0);
 }