X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=qemu-sanity-check.pod.in;h=cff28a4985922d5e87db0f1cfff1cbc62e6a11ae;hb=32c2ebeebf59ea0d4c57f9054b181197a573620e;hp=da3f2370d2126e5054007fce304baa7f45fd0946;hpb=2e43e769fbb287fa3e25363e3f65f85e2123469b;p=qemu-sanity-check.git

diff --git a/qemu-sanity-check.pod.in b/qemu-sanity-check.pod.in
index da3f237..cff28a4 100644
--- a/qemu-sanity-check.pod.in
+++ b/qemu-sanity-check.pod.in
@@ -81,6 +81,15 @@ kernel installed in C</boot>.
 Use the qemu (or KVM) binary C<QEMU> instead of searching C<$PATH> for
 a suitable binary.
 
+=item B<-t> TIMEOUT
+
+=item B<--timeout>=TIMEOUT
+
+Specify a timeout instead of the default which is C<10m> (10 minutes).
+
+The syntax for the C<TIMEOUT> is described in full in the man page for
+L<timeout(1)>.
+
 =item B<-V>
 
 =item B<--version>
@@ -110,16 +119,6 @@ test that userspace has been reached.
 
 =back
 
-=head1 BUGS
-
-=head2 TIMEOUTS
-
-Timeouts don't currently work because of some oddness with the
-coreutils L<timeout(1)> program and qemu.  Instead you should run the
-whole script with a timeout, like this:
-
- timeout 10m qemu-sanity-check
-
 =head1 SEE ALSO
 
 L<http://qemu.org>,
@@ -143,6 +142,6 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.