hurd/running/debian/qemu_image: New.

More actively advertize the public Hurd boxen and the QEMU image.

6 files changed, 56 insertions, 14 deletions

diff --git a/contributing.mdwn b/contributing.mdwn
index 223963c6..7d8d2a0e 100644
--- a/contributing.mdwn
+++ b/contributing.mdwn
@@ -61,6 +61,8 @@ things you're going to work on (and on your internet connection), this may be
 an easy way of getting used to Hurd systems.  Installing in a virtual machine
 is another possibility, see the page about
 [[running_a_Hurd_system|hurd/running]] for the full story.
+In particular, running a Debian GNU/Hurd [[QEMU image|hurd/running/QEMU]] may
+be a viable alternative.
 
 Then you can either play around and eventually strive to do something
 useful or -- if you want -- [[ask_us|contact_us]] to assign something to you, depending
diff --git a/hurd/running/debian.mdwn b/hurd/running/debian.mdwn
index 97d35bd7..b3f53f36 100644
--- a/hurd/running/debian.mdwn
+++ b/hurd/running/debian.mdwn
@@ -1,25 +1,32 @@
 [[!meta title="Debian GNU/Hurd"]]
 
-### Debian Resources
+# Debian Resources
 
 - Official page about the Debian GNU/Hurd port: [Debian GNU/Hurd](http://www.debian.org/ports/hurd/)
 
 - Debian [[FAQ]] -- Frequently Asked Questions
 
-### Installing
+## QEMU Image
+
+[[!inline pages=hurd/running/debian/qemu_image raw=yes feeds=no]]
+
+
+# Installing
 
 - [Installation Instructions](http://www.debian.org/ports/hurd/hurd-install)
   - [Upgrading K11 or K14 based systems to
     unstable](http://lists.debian.org/debian-hurd/2007/09/msg00007.html)
 - [[After_install]] -- Do this to get networking, new console and X
 
-### Contributing
+
+# Contributing
 
 - [[Porting]] -- Helping with porting packages
       * [[Patch_submission]] -- How to submit patches for build failures
 - [[Creating_image_tarball]]
 
-### Additional Information
+
+# Additional Information
 
 - [Presentation](http://people.debian.org/~mbanck/talks/hurd_lt2004/html/)
   *Debian GNU/Hurd* by [[MichaelBanck]], LinuxTag 2004 Karlsruhe
diff --git a/hurd/running/debian/qemu_image.mdwn b/hurd/running/debian/qemu_image.mdwn
new file mode 100644
index 00000000..9f828556
--- /dev/null
+++ b/hurd/running/debian/qemu_image.mdwn
@@ -0,0 +1,23 @@
+[[!meta copyright="Copyright © 2011 Free Software Foundation, Inc."]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+id="license" text="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+There is a QEMU image with [[Debian GNU/Hurd|debian]] pre-installed available
+as <http://people.debian.org/~sthibault/hurd-i386/debian-hurd.img.tar.gz>.
+
+Usage:
+
+    $ wget http://people.debian.org/~sthibault/hurd-i386/debian-hurd.img.tar.gz
+    $ tar -xz < debian-hurd.img.tar.gz
+    $ qemu -net nic,model=rtl8139 -net user debian-hurd-*.img
+
+Just in case you were wondering: the *root* password is *root*.
+
+[[!if test="destpage(hurd/running/qemu)" then="" else="For more detailed
+instructions, please see the [[hurd/running/QEMU]] page."]]
diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn
index 321ceadf..aea20ae8 100644
--- a/hurd/running/qemu.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -14,15 +14,16 @@ This page discusses things for [[Unix]] systems, there is a separate page for
 
 # Readily Available Images
 
-To try out the Hurd you can use the image of the Debian GNU/Hurd: 
+You can use the following images to give the GNU/Hurd a try.
 
-* [Official Debian GNU/Hurd QEMU image](http://ftp.debian-ports.org/debian-cd/K16/debian-hurd-k16-qemu.img.tar.gz)
+## Debian GNU/Hurd
 
-(!) Note that the following are unofficial images: they have been prepared by
-volunteers and may not have been tested extensively.
+[[!inline pages=hurd/running/debian/qemu_image raw=yes feeds=no]]
+
+## Unofficial Images
 
-<!--* [Disk image](http://www.numenor.art.pl/balrog/hurd/) with an installation of
-  [[Debian_GNU/Hurd|running/debian]].-->
+Note that the following images are unofficial ones: they have been prepared by
+volunteers and may not have been tested extensively.
 
 * [Disk image](http://draketo.de/dateien/hurd/bab-hurd-qemu-2008-10-29.img.tar.bz2) 
   with a short intro on translators. Just start it with 'qemu *disk_image.img*'. 
@@ -30,9 +31,10 @@ volunteers and may not have been tested extensively.
   with it, please have a look at [[its_wikipage|hurd/running/qemu/babhurd_image]]. And when 
   you use it, please [tell me your experience with it](http://draketo.de/contact)! - [[community/weblogs/ArneBab]]
 
-Also you can use qemu to easily try one of our [[Hurd_LiveCDs|hurd/running/live_cd/]]. 
+# Arch Hurd Live CD
 
-<!--* [Announcement](http://lists.debian.org/debian-hurd/2007/09/msg00000.html) of  another image. - The link in the email doesn't work anymore, too old. //-->
+Also you can use QEMU to easily try one of the
+[[Hurd_LiveCDs|hurd/running/live_cd/]].
 
 
 # What is Needed to create a QEMU image
@@ -103,7 +105,7 @@ First off you will need to create a disk image using `qemu-img`. I have set mine
 
 Next you will want to start up QEMU and begin the installation process.
 
-    $ qemu -m 512 -hda hd0.img -cdrom mini.iso -net nic,model=rtl8139
+    $ qemu -m 512 -hda hd0.img -cdrom mini.iso -net nic,model=rtl8139 -net user
 
 Now at his point do the regular install using `hd0` as your harddrive. Partition it and install the base system.
 
diff --git a/index.mdwn b/index.mdwn
index 9feb44ec..2eb60d82 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -60,6 +60,11 @@ recommendations about how to contribute|contributing]].
 
 See our [[source_repositories]] for the source code.
 
+## Access to a GNU/Hurd System
+
+We provide accounts on our [[public_Hurd_boxen]], and there are also
+[[hurd/running/QEMU]] images available.
+
 
 # Getting Help
 
diff --git a/public_hurd_boxen.mdwn b/public_hurd_boxen.mdwn
index dfb1f006..33fe5cbc 100644
--- a/public_hurd_boxen.mdwn
+++ b/public_hurd_boxen.mdwn
@@ -15,6 +15,9 @@ There are GNU/Hurd boxes that we're offering shell accounts on.  These are
 generally available for everyone interested in [[contributing]], or just having
 a look at a GNU/Hurd system.
 
+An alternative to online shell access may be using a [[QEMU
+image|hurd/running/qemu]].
+
 [[!table class="table_style_1" data="""
 "Hoster","Name","Distribution","Machine Specs","Comments"
 "[[bddebian]]","blubber","Debian GNU/Hurd","Celeron 2.2 GHz; 222 MiB","Xen domU on [[zenhost]]; for experimental stuff; deactivated until needed again (apart from [[tschwinge]], only [[scolobb]] has an account, but is not active at the moment)"
@@ -25,7 +28,7 @@ a look at a GNU/Hurd system.
 "[[bddebian]]","goober","Debian GNU/Hurd","?"
 "[[bddebian]]","grubber","Debian GNU/Hurd","Celeron 2.2 GHz; 554 MiB","Xen domU on [[zenhost]]; for experimental stuff"
 "[[bddebian]]","[[zenhost]]","Debian GNU/Linux","Celeron 2.2 GHz","Xen dom0 for several hosts"
-"Debian","strauss","Debian GNU/Hurd",,"all Debian Developers have access without any special account setup procedure"
+"Debian","[strauss.debian.net](http://strauss.debian.net/ssh)","Debian GNU/Hurd",,"all Debian Developers have access"
 """]]
 
 To request an account on the *[[bddebian]]* machines either contact