Merge branch 'master' of flubber:~hurd-web/hurd-web

4 files changed, 35 insertions, 7 deletions

diff --git a/hurd/running/debian/after_install.mdwn b/hurd/running/debian/after_install.mdwn
index 15ca9c83..62fd3574 100644
--- a/hurd/running/debian/after_install.mdwn
+++ b/hurd/running/debian/after_install.mdwn
@@ -29,7 +29,8 @@ If the NIC was detected:
 
     # settrans -fgap /servers/socket/2 /hurd/pfinet -i eth0 -a 192.168.1.3 -g 192.168.1.1 -m 255.255.255.0
 
-In order to use DHCP, you need to install the `dhcp-client` package and run `dhclient eth0` etc.
+Or read about how to configure [[DHCP]].
+
 
 # Setup GRUB
 
diff --git a/hurd/running/debian/dhcp.mdwn b/hurd/running/debian/dhcp.mdwn
new file mode 100644
index 00000000..f316981d
--- /dev/null
+++ b/hurd/running/debian/dhcp.mdwn
@@ -0,0 +1,24 @@
+[[!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]]."]]"""]]
+
+[[!tag open_issue_porting]]
+
+In order to use DHCP, you need to install the `ifup` and `isc-dhcp-client`
+packages, and manually create the following two symbolic links:
+
+    # ln -s ../rcS.d/S06ifupdown-clean ../rcS.d/S11networking /etc/rc.boot/
+
+During execution at boot time, the `S11networking` script will emit some error
+messages while trying to configure the loopback interface.  These are not
+fatal.
+
+Debian GNU/Hurd doesn't currently execute's Debian standard `/etc/rcS.d/*` boot
+scripts, but has its own `/libexec/rc` script -- which integrates scripts from
+`/etc/rc.boot/` instead.
diff --git a/hurd/running/qemu.mdwn b/hurd/running/qemu.mdwn
index 67a1be7c..4766b2be 100644
--- a/hurd/running/qemu.mdwn
+++ b/hurd/running/qemu.mdwn
@@ -230,9 +230,7 @@ If you just want to access the internet from within QEMU, you can setup pfinet f
     # settrans -afgp /servers/socket/2 /hurd/pfinet -i eth0 -a 10.0.2.15 -g 10.0.2.2 -m 255.255.255.0
     # echo "nameserver 10.0.2.3" > /etc/resolv.conf
 
-Alternately DHCP does work now:
-
-    # dhclient eth0
+If you are on [[Debian GNU/Hurd|debian]], you can even use [[debian/DHCP]].
 
 To get ssh working:
 
diff --git a/hurd/running/vbox.mdwn b/hurd/running/virtualbox.mdwn
index 475abf4a..02ab88e7 100644
--- a/hurd/running/vbox.mdwn
+++ b/hurd/running/virtualbox.mdwn
@@ -5,10 +5,15 @@ 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]]."]]"""]]
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
 
-## Installation  
+[[!meta title="VirtualBox"]]
+
+<http://www.virtualbox.org/>
+
+
+# Installation  
 
 The disk controller has to be configured as IDE. Neither SATA nor SCSI are
 supported.