Update manpages for --shutdown-timeout

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --git a/man/gnt-backup.sgml b/man/gnt-backup.sgml
index 2c8eba2..d9c1fe7 100644 (file)
--- a/man/gnt-backup.sgml
+++ b/man/gnt-backup.sgml
@@ -63,8 +63,10 @@
       <cmdsynopsis>
         <command>export</command>
         <arg choice="req">-n <replaceable>node</replaceable></arg>
+        <arg>--shutdown-timeout=<replaceable>N</replaceable></arg>
         <arg>--noshutdown</arg>
         <arg choice="req"><replaceable>instance</replaceable></arg>
+
       </cmdsynopsis>
 
       <para>
@@ -75,6 +77,13 @@
       </para>
 
       <para>
+        The <option>--shutdown-timeout</option> is used to specify how
+        much time to wait before forcing the shutdown (xm destroy in xen,
+        killing the kvm process, for kvm). By default two minutes are
+        given to each instance to stop.
+      </para>
+
+      <para>
         The <option>--noshutdown</option> option will create a
         snapshot disk of the instance without shutting it down first.
         While this is faster and involves no downtime, it cannot be

diff --git a/man/gnt-instance.sgml b/man/gnt-instance.sgml
index 908c25e..e5946ca 100644 (file)
--- a/man/gnt-instance.sgml
+++ b/man/gnt-instance.sgml
@@ -785,6 +785,7 @@ instance5: 11225
         <cmdsynopsis>
           <command>remove</command>
           <arg>--ignore-failures</arg>
+          <arg>--shutdown-timeout=<replaceable>N</replaceable></arg>
           <arg>--submit</arg>
           <arg choice="req"><replaceable>instance</replaceable></arg>
         </cmdsynopsis>
@@ -807,6 +808,13 @@ instance5: 11225
         </para>
 
         <para>
+          The <option>--shutdown-timeout</option> is used to specify how
+          much time to wait before forcing the shutdown (xm destroy in xen,
+          killing the kvm process, for kvm). By default two minutes are
+          given to each instance to stop.
+        </para>
+
+        <para>
           The <option>--submit</option> option is used to send the job to
           the master daemon but not wait for its completion. The job
           ID will be shown so that it can be examined via
@@ -1593,6 +1601,8 @@ instance5: 11225
           <sbr>
           <arg>--ignore-secondaries</arg>
           <sbr>
+          <arg>--shutdown-timeout=<replaceable>N</replaceable></arg>
+          <sbr>
           <arg>--force-multiple</arg>
           <sbr>
           <group choice="opt">
@@ -1634,6 +1644,13 @@ instance5: 11225
         </para>
 
         <para>
+          The <option>--shutdown-timeout</option> is used to specify how
+          much time to wait before forcing the shutdown (xm destroy in xen,
+          killing the kvm process, for kvm). By default two minutes are
+          given to each instance to stop.
+        </para>
+
+        <para>
           The <option>--force-multiple</option> will skip the
           interactive confirmation in the case the more than one
           instance will be affected.
@@ -1978,6 +1995,7 @@ node1.example.com:disk/1:/dev/drbd1
           <command>failover</command>
           <arg>-f</arg>
           <arg>--ignore-consistency</arg>
+          <arg>--shutdown-timeout=<replaceable>N</replaceable></arg>
           <arg>--submit</arg>
           <arg choice="req"><replaceable>instance</replaceable></arg>
         </cmdsynopsis>
@@ -2000,6 +2018,13 @@ node1.example.com:disk/1:/dev/drbd1
         </para>
 
         <para>
+          The <option>--shutdown-timeout</option> is used to specify how
+          much time to wait before forcing the shutdown (xm destroy in xen,
+          killing the kvm process, for kvm). By default two minutes are
+          given to each instance to stop.
+        </para>
+
+        <para>
           The <option>--submit</option> option is used to send the job to
           the master daemon but not wait for its completion. The job
           ID will be shown so that it can be examined via
@@ -2099,6 +2124,7 @@ y/[n]/?: y
           <command>move</command>
           <arg>-f</arg>
           <arg>-n <replaceable>node</replaceable></arg>
+          <arg>--shutdown-timeout=<replaceable>N</replaceable></arg>
           <arg>--submit</arg>
           <arg choice="req"><replaceable>instance</replaceable></arg>
         </cmdsynopsis>
@@ -2116,6 +2142,13 @@ y/[n]/?: y
         </para>
 
         <para>
+          The <option>--shutdown-timeout</option> is used to specify how
+          much time to wait before forcing the shutdown (xm destroy in xen,
+          killing the kvm process, for kvm). By default two minutes are
+          given to each instance to stop.
+        </para>
+
+        <para>
           The <option>--submit</option> option is used to send the job to
           the master daemon but not wait for its completion. The job
           ID will be shown so that it can be examined via