Allow creating partition tables with Block.Format()

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/data/org.freedesktop.UDisks2.xml b/data/org.freedesktop.UDisks2.xml
index 7afa94c..687709e 100644 (file)
--- a/data/org.freedesktop.UDisks2.xml
+++ b/data/org.freedesktop.UDisks2.xml
@@ -772,10 +772,11 @@
 
     <!--
         Format:
-        @type: The type of file system or other content to format the device with.
+        @type: The type of file system, partition table or other content to format the device with.
         @options: Options - known options (in addition to <link linkend="udisks-std-options">standard options</link>) includes <parameter>label</parameter> (of type 's'), <parameter>take-ownership</parameter> (of type 'b') and <parameter>encrypt.passphrase</parameter> (of type 's').
 
-        Formats the device with a file system or other well-known content.
+        Formats the device with a file system, partition table or
+        other well-known content.
 
         Known values for @type includes <constant>empty</constant> (to
         just zero out areas of the device known to host file system
@@ -783,6 +784,9 @@
         and most file systems supported by the <citerefentry><refentrytitle>mkfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
         program through its <option>-t</option> option.
 
+        Known partition table formats includes
+        <constant>dos</constant> and <constant>gpt</constant>.
+
         If @type supports it, you can specify a label with the
         <parameter>label</parameter> option in the @options parameter;
         however, note that this may not be supported on all file

diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
index 8c3b948..69c114d 100644 (file)
--- a/src/udiskslinuxblock.c
+++ b/src/udiskslinuxblock.c
@@ -1743,7 +1743,7 @@ handle_format (UDisksBlock           *block,
                                                     NULL,
                                                     action_id,
                                                     options,
-                                                    N_("Authentication is required to create a file system"),
+                                                    N_("Authentication is required to format $(udisks2.device)"),
                                                     invocation))
     goto out;
 

diff --git a/src/udiskslinuxfsinfo.c b/src/udiskslinuxfsinfo.c
index c8c7240..a27ad22 100644 (file)
--- a/src/udiskslinuxfsinfo.c
+++ b/src/udiskslinuxfsinfo.c
@@ -26,6 +26,7 @@
 
 const FSInfo _fs_info[] =
   {
+    /* filesystems */
     {
       "ext2",
       "e2label $DEVICE $LABEL",
@@ -96,6 +97,7 @@ const FSInfo _fs_info[] =
       FALSE,
       "mkfs.minix $DEVICE",
     },
+    /* swap space */
     {
       "swap",
       NULL,
@@ -103,6 +105,22 @@ const FSInfo _fs_info[] =
       FALSE,
       "mkswap -L $LABEL $DEVICE",
     },
+    /* partition tables */
+    {
+      "dos",
+      NULL,
+      NULL,
+      FALSE,
+      "parted --script $DEVICE mktable msdos",
+    },
+    {
+      "gpt",
+      NULL,
+      NULL,
+      FALSE,
+      "parted --script $DEVICE mktable gpt",
+    },
+    /* empty */
     {
       "empty",
       NULL,