From: Erik Skultety <eskultet@redhat.com>
Date: Thu, 25 Sep 2014 14:26:18 +0000 (+0200)
Subject: storage: Fix logical pool fmt type
X-Git-Tag: v1.2.9-rc2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1be67cd31b14172caee9bcc2daec64a908d71e94;p=thirdparty%2Flibvirt.git

storage: Fix logical pool fmt type

According to our documentation logical pool supports formats 'auto' and
'lvm2'. However, in storage_conf.c we previously defined storage pool
formats: unknown, lvm2. Due to backward compatibility reasons
we must continue refer to pool format type 'unknown' instead of 'auto'.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1123767
---

diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index 2d165a3493..0f05c5cc5f 100644
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -465,7 +465,7 @@
       <element name='format'>
         <attribute name='type'>
           <choice>
-            <value>auto</value>
+            <value>unknown</value> <!-- back-compat requires keeping 'unknown' not 'auto' -->
             <value>lvm2</value>
           </choice>
         </attribute>
diff --git a/docs/storage.html.in b/docs/storage.html.in
index 3d2ffcaafb..9933548f7c 100644
--- a/docs/storage.html.in
+++ b/docs/storage.html.in
@@ -328,14 +328,10 @@
 
     <h3>Valid pool format types</h3>
     <p>
-      The logical volume pool supports the following formats:
+      The logical volume pool supports only the <code>lvm2</code> format,
+      although not supplying a format value will result in automatic
+      selection of the<code>lvm2</code> format.
     </p>
-    <ul>
-      <li><code>auto</code> - automatically determine format</li>
-      <li>
-        <code>lvm2</code>
-      </li>
-    </ul>
 
     <h3>Valid volume format types</h3>
     <p>