12 files changed, 127 insertions, 33 deletions
diff --git a/hurd/running/Guix.mdwn b/hurd/running/Guix.mdwn
new file mode 100644
index 00000000..64f9d0e7
--- /dev/null
+++ b/hurd/running/Guix.mdwn
@@ -0,0 +1,19 @@
+[[!meta title="Guix"]]
+
+GNU/Hurd support has been integrated in Guix.
+
+---
+# QEMU Image
+[[!inline pages=hurd/running/Guix/qemu_image raw=yes feeds=no]]
+
+---
+# Documentation
+
+As Hurd support is integrated in Guix, the official documentation (<https://guix.gnu.org/en/manual/devel/>) also works for Hurd. 
+
+Guix has even support in its configuration language for creating Hurd VMs from a running Guix system (<https://guix.gnu.org/en/manual/devel/en/guix.html#The-Hurd-in-a-Virtual-Machine>).
+
+---
+# Status
+
+At the time of writing, the official Guix manual says that "This configuration is experimental and under development. The easiest way for you to give it a try is by setting up an instance of hurd-vm-service-type on your GNU/Linux machine (see hurd-vm-service-type). See Contributing, on how to help!" (<https://guix.gnu.org/en/manual/devel/en/guix.html#GNU-Distribution>).
diff --git a/hurd/running/Guix/qemu_image.mdwn b/hurd/running/Guix/qemu_image.mdwn
new file mode 100644
index 00000000..52985c6f
--- /dev/null
+++ b/hurd/running/Guix/qemu_image.mdwn
@@ -0,0 +1,14 @@
+[//]: # ([[meta copyright="Copyright © 2011, 2012, 2014, 2016 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]]."]]"""]]
+
+[[!meta title="Guix's QEMU Image"]]
+
+There is a QEMU image with [[Guix GNU/Hurd|guix]] pre-installed available
+at <https://ci.guix.gnu.org/search/latest/image?query=spec:images+status:success+system:x86_64-linux+hurd-barebones.qcow2>.
diff --git a/hurd/running/chroot.mdwn b/hurd/running/chroot.mdwn
index eac67282..0f5ec88f 100644
--- a/hurd/running/chroot.mdwn
+++ b/hurd/running/chroot.mdwn
@@ -24,7 +24,7 @@ It can be a good idea to put the chroot on a separate translator, for instance:
 
 Debootstrap should be able to build the content:
 
-    # debootstrap sid chroot
+    # debootstrap --keyring=/usr/share/keyrings/debian-ports-archive-keyring.gpg --extra-suites=unreleased sid chroot http://deb.debian.org/debian-ports/
 
 # Tricks
 
diff --git a/hurd/running/cloud.mdwn b/hurd/running/cloud.mdwn
index 736a7113..3d0d37ef 100644
--- a/hurd/running/cloud.mdwn
+++ b/hurd/running/cloud.mdwn
@@ -15,4 +15,4 @@ It is possible to run the Hurd as a KVM-based OpenStack cloud instance.
 [[For the time being|open_issues/virtio]], you'll have to avoid using virtio
 drivers, and use emulated hardware instead:
 
-    $ glance image-create --property hw_disk_bus=ide --property hw_cdrom_bus=ide --property hw_vif_model=rtl8139 --disk-format raw  --container-format bare --name gnu-hurd --copy-from https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/debian-hurd.img
+    $ glance image-create --property hw_disk_bus=ide --property hw_cdrom_bus=ide --property hw_vif_model=e1000 --disk-format raw  --container-format bare --name gnu-hurd --copy-from https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/debian-hurd.img
diff --git a/hurd/running/debian/CrossInstall.mdwn b/hurd/running/debian/CrossInstall.mdwn
index c7a099c6..26cd77af 100644
--- a/hurd/running/debian/CrossInstall.mdwn
+++ b/hurd/running/debian/CrossInstall.mdwn
@@ -17,9 +17,9 @@ Next we create a useful mountpoint and mount the partition.
 
 ### <a name="Retrieving_CrossHurd"> Retrieving CrossHurd </a>
 
-Unless you don't run Debian GNU/Linux download it from <http://packages.debian.org/crosshurd>, or simply apt-get the package from Testing or Unstable. Avoid using the version from Stable since it probably is outdated. In case of problems, make sure to try the Unstable version before reporting the issue.
+Unless you don't run Debian GNU/Linux download it from <http://packages.debian.org/crosshurd>, or simply apt the package from Testing or Unstable. Avoid using the version from Stable since it probably is outdated. In case of problems, make sure to try the Unstable version before reporting the issue.
 
-    # apt-get install crosshurd
+    # apt install crosshurd
 
 ### <a name="Cross_installing"> Cross installing </a>
 
diff --git a/hurd/running/debian/DebianAptOffline.mdwn b/hurd/running/debian/DebianAptOffline.mdwn
index 9596040d..f97e5148 100644
--- a/hurd/running/debian/DebianAptOffline.mdwn
+++ b/hurd/running/debian/DebianAptOffline.mdwn
@@ -24,11 +24,11 @@ As root on the internet connected OS:
 
     # mount /dev/DEBIAN_GNU_HURD_PARTITON /mnt
     # cd /mnt
-    # apt-get -c etc/apt/apt.conf.offline {update, upgrade, install foo, etc.}
+    # apt -c etc/apt/apt.conf.offline {update, upgrade, install foo, etc.}
 
 Then, reboot into your Debian GNU/Hurd installation and as root, run:
 
-    # apt-get {update, upgrade, install foo, etc.}
+    # apt {update, upgrade, install foo, etc.}
 
 ## If you _cannot_ mount your Debian GNU/Hurd partition under another OS.
 
@@ -47,7 +47,7 @@ From the remote sytem, as any user, run:
     $ cd myhurd
     $ tar -xf myhurdsconf.tar
     $ mkdir -p var/lib/apt/lists/partial var/cache/apt/archives/partial tmp
-    $ apt-get -c etc/apt/apt.conf.offline {update, upgrade, install foo, etc.}
+    $ apt -c etc/apt/apt.conf.offline {update, upgrade, install foo, etc.}
     $ tar cf myhurdsconf.tar etc/apt/{apt.conf.offline,sources.list} var/
 
 Copy _myhurdsconf.tar_ back to your Debian GNU/Hurd system.
@@ -59,4 +59,4 @@ Finally, from your Debian GNU/Hurd installation as the root user:
     # tar -xf myhurdsconf.tar
     # mv var/cache/apt/archives/*.deb /var/cache/apt/archives/
     # mv var/lib/apt/lists/*_* /var/lib/apt/lists/
-    # apt-get {update, upgrade, install foo, etc.}
+    # apt {update, upgrade, install foo, etc.}
diff --git a/hurd/running/debian/MediaPressKitDiscuss.mdwn b/hurd/running/debian/MediaPressKitDiscuss.mdwn
index 2bd97290..05e1761a 100644
--- a/hurd/running/debian/MediaPressKitDiscuss.mdwn
+++ b/hurd/running/debian/MediaPressKitDiscuss.mdwn
@@ -71,6 +71,6 @@ I think another active process for tracking recent news (if it doesn't already e
 
 Here are some interesting urls from [this issue](http://www.debian.org/News/weekly/2003/03/) of the Debian Weekly news:
 
-**Debian Presentations.** Wolfgang Borgert was [looking](http://lists.debian.org/debian-devel-0301/msg00991.html) for a set of slides on dpkg, apt-get and debconf. Javier Fern�ndez-Sanguino Pe�a [intends](http://lists.debian.org/debian-devel-0301/msg01022.html) to provide a 'presentations' section in the [Debian Documentation Project](http://cvs.debian.org/ddp/?cvsroot=debian-doc) (DDP) and has already created an [archive](http://dat.etsit.upm.es/~jfs/debian/www/ddp/slides/) of slides. Whilst the Debian web site does link to [talks](http://www.debian.org/events/talks) given by developers and some [sample slides](http://www.debian.org/events/materials/slides/), it is difficult to gather this information and publish it in a homogeneous way. Talks should be reported to <events@debianNOSPAM.org> and forwarded to him.
+**Debian Presentations.** Wolfgang Borgert was [looking](http://lists.debian.org/debian-devel-0301/msg00991.html) for a set of slides on dpkg, apt and debconf. Javier Fern�ndez-Sanguino Pe�a [intends](http://lists.debian.org/debian-devel-0301/msg01022.html) to provide a 'presentations' section in the [Debian Documentation Project](http://cvs.debian.org/ddp/?cvsroot=debian-doc) (DDP) and has already created an [archive](http://dat.etsit.upm.es/~jfs/debian/www/ddp/slides/) of slides. Whilst the Debian web site does link to [talks](http://www.debian.org/events/talks) given by developers and some [sample slides](http://www.debian.org/events/materials/slides/), it is difficult to gather this information and publish it in a homogeneous way. Talks should be reported to <events@debianNOSPAM.org> and forwarded to him.
 
 -- [[Main/GrantBow]] - 22 Jan 2003
diff --git a/hurd/running/debian/after_install.mdwn b/hurd/running/debian/after_install.mdwn
index d3d32a6f..927d05f1 100644
--- a/hurd/running/debian/after_install.mdwn
+++ b/hurd/running/debian/after_install.mdwn
@@ -11,7 +11,7 @@ typing a boring arcane.  There are Debian-specific scripts that may help
 you.  See [[GRUB]]'s page for this.
 
 
-# Setup `apt-get`
+# Setup `apt
 
 Installing packages without having a network connection is described
 [[DebianAptOffline]].
diff --git a/hurd/running/debian/qemu_image.mdwn b/hurd/running/debian/qemu_image.mdwn
index 6ae16d8b..9984ac33 100644
--- a/hurd/running/debian/qemu_image.mdwn
+++ b/hurd/running/debian/qemu_image.mdwn
@@ -22,16 +22,27 @@ Usage:
 
 	$ wget https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/debian-hurd.img.tar.gz
 	$ tar -xz < debian-hurd.img.tar.gz
-	$ kvm -m 1G -drive cache=writeback,file=$(echo debian-hurd-*.img) -no-reboot -net user,hostfwd=tcp:127.0.0.1:2222-:22
+	$ kvm -m 1G -drive cache=writeback,file=$(echo debian-hurd-*.img) -no-reboot -net user,hostfwd=tcp:127.0.0.1:2222-:22 -net nic,model=e1000
 
-* Login as root (the root password is empty)
+* Log in as root (the root password is empty)
 * Set up a root password with `passwd`
 
+* update the system with `apt update && apt upgrade`
+
+* Log in as demo (the demo password is empty)
+* Set up a demo password with `passwd`
+
+* You can also create another non-root user with `adduser <username>`
+* and set the non-root user password with `passwd <username>`
+* and add the non-root user to the sudo group via `gpasswd -a <user> sudo`
+
+* logout via `logout`
+
 Optionally you may use `--curses` to keep your keyboard layout. If need be modprobe kvm_amd, kvm intel and kvm to get kvm support (which is much, much faster).
 
 Note that if you do not have a command named `kvm`, you can try something across the lines of:
 
-	$ qemu-system-i386 --enable-kvm -drive cche=writeback,file=$(echo debian-hurd-*.img) -net user,hostfwd=tcp:127.0.0.1:2222-:22
+	$ qemu-system-i386 --enable-kvm -drive cche=writeback,file=$(echo debian-hurd-*.img) -net user,hostfwd=tcp:127.0.0.1:2222-:22 -net nic,model=e1000
 
 Or, if your machine does not allow for KVM acceleration, omit `--enable-kvm` from the command.
 
diff --git a/hurd/running/debian/status.mdwn b/hurd/running/debian/status.mdwn
index 95e48edc..cf3592e7 100644
--- a/hurd/running/debian/status.mdwn
+++ b/hurd/running/debian/status.mdwn
@@ -1,4 +1,4 @@
 Debian GNU/Hurd is currently an official, non-releasing Debian port. I.e., there is no testing or stable distribution.
 
- - [Build daemon/archive status](http://unstable.buildd.net/buildd/hurd-i386_stats)
- - [Number of registered users](http://buildd.net/cgi/archvote.phtml)
+ - [Build daemon/archive status](https://buildd.debian.org/status/architecture.php?a=hurd-i386&suite=sid)
+ - [Number of registered users](https://popcon.debian.org/stat/sub-hurd-i386.png)
diff --git a/hurd/running/distrib.mdwn b/hurd/running/distrib.mdwn
index 357d840a..5d12f8ec 100644
--- a/hurd/running/distrib.mdwn
+++ b/hurd/running/distrib.mdwn
@@ -14,6 +14,7 @@ There are several GNU distributions that are built on the Hurd. If you develop a
 ###Working distributions of GNU/Hurd: 
 
 * [[Debian]]
+* [[Guix]]
 
 ###GNU/Hurd distributions in early stages of development: 
 
diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn
index 6df06ace..c56292c8 100644
--- a/hurd/running/qemu.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -24,6 +24,56 @@ You can use the following images to give the Hurd a try.
 
 [[!inline pages=hurd/running/debian/qemu_image raw=yes feeds=no]]
 
+#### Trying out rumpdisk
+
+[[Rump kernels|hurd/rump]] provide new modern drivers for the Hurd.
+We refer to rumpdisk as a rump kernel that provides drivers for modern
+hard drives, SSDs, etc.  The Rump kernels' integration into the Hurd
+are still somewhat experimental, but they seem to work fairly well on
+bleeding edge Debian.
+
+Once you have your latest qemu Debian GNU/Hurd image running, then you
+can try the rumpdisk (be sure to pass "-m 2GB" or more).  First,
+add these sources to your /etc/apt/sources.list
+
+    deb http://deb.debian.org/debian-ports unstable main
+    deb-src http://deb.debian.org/debian unstable main
+    deb http://deb.debian.org/debian-ports unreleased main
+
+Then, upgrade to the bleeding edge Debian GNU/Hurd:
+
+     # apt update
+     # apt upgrade --without-new-pkgs
+     # apt dist-upgrade
+
+Now test to see if the rump kernel works before you make the change
+permanent.  Manually tweak your /boot/grub/grub.cfg like so:
+
+    #	multiboot	/boot/gnumach-1.8-486.gz root=part:2:device:hd0 console=com0
+	multiboot	/boot/gnumach-1.8-486.gz root=part:2:device:wd0 console=com0 noide
+
+and your /etc/fstab
+
+    #/dev/hd0s2      /               ext2    defaults        0       1
+    /dev/wd0s2      /               ext2    defaults        0       1
+    #/dev/hd0s1      none            swap    sw              0       0
+    /dev/wd0s1      none            swap    sw              0       0
+    #/dev/hd2        /media/cdrom0   iso9660 noauto          0       0
+    /dev/wd2        /media/cdrom0   iso9660 noauto          0       0
+
+Now you can poweroff your machine, reboot, and start using the
+rumpdisk!  You can make these changes permanent by tweaking
+/etc/default/grub and telling it to use rumpdisk:
+
+	GRUB_CMDLINE_GNUMACH="noide"
+
+Then update your grub:
+
+     # update-grub
+
+Check that "noide" does appear in your /boot/grub/grub.cfg.
+
+
 ## Arch Hurd Live CD
 
 [[!inline pages=hurd/running/live_cd raw=yes feeds=no]]
@@ -50,7 +100,7 @@ volunteers and may not have been tested extensively.
 
 ## Debian Installer
 
-Instructions for creating a qemu image from the install CDs from debian installer can be found in the README alongside the d-i Hurd images: <http://people.debian.org/~sthibault/hurd-i386/installer/cdimage/>
+Instructions for creating a qemu image from the install CDs from debian installer can be found in the README alongside the d-i Hurd images: <https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/>
 
 ---
 # KVM acceleration
@@ -60,7 +110,7 @@ Check if your CPU supports kvm:
     $ egrep '^flags.*(vmx|svm)' /proc/cpuinfo
 
 #### If you don't have hardware support (slow):
-    $ apt-get install qemu
+    $ apt install qemu
 
 Do not enable kernel-kqemu, as that assumes some particular behavior from the guest kernel, which we are reluctant to artificially add to gnumach.
 
@@ -68,7 +118,7 @@ If QEMU with KVM is not available, [[Virtualbox]] reportedly has better
 performance.
 
 #### If you have hardware support (recommended):
-    $ apt-get install qemu-kvm
+    $ apt install qemu-kvm
     $ modprobe kvm
 
 Intel VTx/VTd: Enable Intel kvm in the BIOS
@@ -119,7 +169,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 1G -drive cache=writeback,file=hd0.img -cdrom debian-7.0-hurd-i386-NETINST-1.iso -net nic,model=rtl8139 -net user
+    $ qemu -m 1G -drive cache=writeback,file=hd0.img -cdrom debian-7.0-hurd-i386-NETINST-1.iso -net nic,model=e1000 -net user
 
 Now at his point do the regular install using `hd0` as your harddrive. Partition it and install the base system.
 
@@ -167,7 +217,7 @@ Once you have finished installing the base system (might take some time) the sys
 
 Starting qemu/qemu-kvm:
 
-    $ kvm -m 1G -net nic -net user,hostfwd=tcp::5555-:22 -drive cache=writeback,file=hd0.img -vga vmware
+    $ kvm -m 1G -net nic,model=e1000 -net user,hostfwd=tcp::5555-:22 -drive cache=writeback,file=hd0.img -vga vmware
     vmsvga_value_write: guest runs Linux.
 
 Note: See below on port forwarding in the networking section.
@@ -252,13 +302,13 @@ If you are on [[Debian GNU/Hurd|debian]], you can even use [[debian/DHCP]].
 
 To get ssh working:
 
-    # apt-get install random-egd openssh-server (Similarly for telnet if preferred)
+    # apt install openssh-server (Similarly for telnet if preferred)
 
 (See also <http://www.nongnu.org/qemu/qemu-doc.html#SEC32>.)
 
 Outgoing internet connections should just work then.
 Testing it can be difficult with a minimal installation,
-but `apt-get update` should work after you have filled out
+but `apt update` should work after you have filled out
 `/etc/apt/sources.list`.
 After that you should be able to install other network packages,
 but note that `ping` doesn't work with QEMU's user-networking stack.
@@ -288,7 +338,7 @@ This is the recommended way to work with a Command Line Interface (CLI) since al
 
 a) with ssh (assuming you have installed openssh-server)
 
-    $ kvm -m 1G -net nic -net user,hostfwd=tcp::5555-:22 -drive cache=writeback,file=hd0.img &
+    $ kvm -m 1G -net nic,model=e1000 -net user,hostfwd=tcp::5555-:22 -drive cache=writeback,file=hd0.img &
 
 Logging in to the running Hurd:
 
@@ -305,7 +355,7 @@ Copying files:
 
 b) with telnet (assuming you have installed a telnet server, like telnetd)
 
-    $ kvm -m 1G -net nic -net user,hostfwd=tcp::5556-:23 -drive cache=writeback,file=hurd-install.qemu &
+    $ kvm -m 1G -net nic,model=e1000 -net user,hostfwd=tcp::5556-:23 -drive cache=writeback,file=hurd-install.qemu &
 
 Logging in to the running Hurd:
 
@@ -346,7 +396,7 @@ Now it is time to start-up your QEMU Hurd system and get networking going in the
 
 **Important:** Remember you may need to use the `-M isapc` or `-isa` flag if using an older version of the gnumach package.
 
-    $ qemu -m 1G -drive cache=writeback,file=hd0.img -cdrom debian-K9-hurd-i386-CD1.iso -fda floppy.img -boot a -net nic -net tap
+    $ qemu -m 1G -drive cache=writeback,file=hd0.img -cdrom debian-K9-hurd-i386-CD1.iso -fda floppy.img -boot a -net nic,model=e1000 -net tap
 
 Once you have logged in as `root` run the `pfinet` translator with values that apply to your network. Think of your QEMU client as another computer in your network.
 
@@ -355,14 +405,16 @@ Once you have logged in as `root` run the `pfinet` translator with values that a
 That should do it! Do not forget to edit/update `/etc/resolv.conf` to get DNS working.
 
 ---
-# Multiboot
+# Booting Hurd without grub, using qemu's multiboot support
 
 See "Linux/Multiboot boot specific" section on QEMU manpage.
 
 Get the multiboot modules.  Either extract them from the disk image, or,
 download:
 
-    $ wget http://people.debian.org/~sthibault/hurd-i386/installer/cdimage/current/{gnumach.gz,ext2fs.static,ld.so.1}
+    $ wget https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/gnumach.gz
+    $ wget https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/ext2fs.static
+    $ wget https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/exec.static
 
 Generally, these files need to correspond to the ones in the disk image, so
 don't forget to keep them up to date.
@@ -372,18 +424,15 @@ you'll get told: *qemu: linux kernel too old to load a ram disk*.
 
     $ qemu [...] \
     > --kernel gnumach \
+    > --append 'root=device:hd0s1' \
     > --initrd \
-    > 'ext2fs.static --multiboot-command-line=${kernel-command-line} --host-priv-port=${host-port} --device-master-port=${device-port} --exec-server-task=${exec-task} -T typed device:hd0s1 $(task-create) $(task-resume)',\
-    > 'ld.so.1 /hurd/exec $(exec-task=task-create)'
+    > 'ext2fs.static --multiboot-command-line=${kernel-command-line} --host-priv-port=${host-port} --device-master-port=${device-port} --exec-server-task=${exec-task} -T typed ${root} $(task-create) $(task-resume)',\
+    > 'exec.static $(exec-task=task-create)'
 
 Note that, contrary to [[GRUB]]'s configuration file, you don't specify
 "`argv[0]`" here, and it's fortunate that neither ext2fs nor exec need a comma
 on their command line...
 
-You can also use `--append [...]`, which will show up in `/proc/cmdline`.
-
-Command line above crashes with old qemu versions, for instance qemu 1.1.2 on Debian Wheezy, fixed by upgrading to wheezy-backports currently qemu 1.7.0, see [[!debbug 741873]]
-
 ---
 # Related Links