summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Branson <jbranso@fastmail.com>2018-10-29 14:20:54 -0400
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-10-29 21:04:09 +0100
commit38a6c4e7e5631f44449d154d20b3aee1b02c85b1 (patch)
tree70a45af8a547a689a0ab045e2420b8497d56e19f
parentca08eb1d649f23a0fbf5584cdd2faac9c0fe7628 (diff)
I fixed two misspellings. I combined the information in the "instant development environment" and the running the hurd in qemu page.
-rw-r--r--contributing.mdwn11
-rw-r--r--hurd/running/debian/qemu_image.mdwn15
-rw-r--r--hurd/running/qemu/networking.mdwn2
-rw-r--r--hurd/translator/hostmux.mdwn2
4 files changed, 17 insertions, 13 deletions
diff --git a/contributing.mdwn b/contributing.mdwn
index cf812b1..45460f6 100644
--- a/contributing.mdwn
+++ b/contributing.mdwn
@@ -177,12 +177,11 @@ I'll have to think about it some more.
*This is a very brief guide to get your development environment set up. Pester ArneBab @ irc.freenode.net on IRC if something does not work :)*
([[!taglink open_issue_documentation]])
-* Install qemu-kvm via your distros packages.
-* Download the [qemu image](https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/debian-hurd.img.tar.gz): `wget https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/debian-hurd.img.tar.gz`
-* Unpack it: `tar xf debian-hurd.img.tar.gz`
-* Run it: `kvm -m 512 -drive cache=writeback,file=debian-hurd.img -redir tcp:2222::22` # Optionally 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). See also: [kvm FAQ](http://www.linux-kvm.org/page/FAQ).
-* login as root
-* set a root password with `passwd`
+
+First run the hurd in [[qemu|hurd/running/qemu#index1h2]]
+
+After you have a Hurd vm set up and running:
+
* `apt-get update`
* `apt-get install -y git mercurial emacs vim`
* `apt-get build-dep -y hurd gnumach`
diff --git a/hurd/running/debian/qemu_image.mdwn b/hurd/running/debian/qemu_image.mdwn
index 6cafc83..835f36e 100644
--- a/hurd/running/debian/qemu_image.mdwn
+++ b/hurd/running/debian/qemu_image.mdwn
@@ -14,9 +14,16 @@ as <https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/debian-hurd.img.ta
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)
+* Install qemu-kvm via your distros packages.
+* Download the debian image
+ $ `wget https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/debian-hurd.img.tar.gz`
+* Unpack it.
+ $ `tar -xz < debian-hurd.img.tar.gz`
+* Run it
+ $ `kvm -m 1G -drive cache=writeback,file=$(echo debian-hurd-*.img) -redir tcp:2222::22`
+ # Optionally 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).
+* Login as root (the root password is empty)
+* set up a root password with passwd
Please also read the README file: <https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/README>
@@ -27,7 +34,5 @@ or even the plain version <https://cdimage.debian.org/cdimage/ports/latest/hurd-
See the discussion about [[hurd/running/qemu/writeback_caching]].
-Just in case you were wondering: the *root* password is empty.
-
[[!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/networking.mdwn b/hurd/running/qemu/networking.mdwn
index 0c8e0ae..c91c7fc 100644
--- a/hurd/running/qemu/networking.mdwn
+++ b/hurd/running/qemu/networking.mdwn
@@ -12,7 +12,7 @@ License|/fdl]]."]]"""]]
## User mode network
This is the default networking option for qemu. This does not require root
-previleges. If you have DHCP running it will take the ip as 10.0.2.15
+privileges. If you have DHCP running it will take the ip as 10.0.2.15
You can setup an ip 10.0.2.*
Gateway is 10.0.2.2
diff --git a/hurd/translator/hostmux.mdwn b/hurd/translator/hostmux.mdwn
index ef16505..d997e01 100644
--- a/hurd/translator/hostmux.mdwn
+++ b/hurd/translator/hostmux.mdwn
@@ -1,4 +1,4 @@
-Multiplexes arbitrary host names, making access to many differnt host fast and easy.
+Multiplexes arbitrary host names, making access to many different host fast and easy.
For each host accessed via a directory an new translator is started with the hostname as option. Say, /hostmuxdemo should let you access your favourite host with your translator mytranslatorfs.