summaryrefslogtreecommitdiff
path: root/hurd
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2013-09-26 15:58:55 +0200
committerThomas Schwinge <thomas@codesourcery.com>2013-09-26 15:58:55 +0200
commit583535d65ef20474d970c71f90d39ff5f5bf7180 (patch)
tree9867c64dd41e510613fc1e95a357c832dc71c3d5 /hurd
parent295f1c447d706315e5bce15365f89c9e6983c721 (diff)
parent99f7a42c80813fcbec01277ceb13a82f7f4421c7 (diff)
Merge commit '99f7a42c80813fcbec01277ceb13a82f7f4421c7'
Conflicts: open_issues/dde.mdwn
Diffstat (limited to 'hurd')
-rw-r--r--hurd/running.mdwn2
-rw-r--r--hurd/running/cloud.mdwn18
-rw-r--r--hurd/running/openstack.mdwn14
3 files changed, 19 insertions, 15 deletions
diff --git a/hurd/running.mdwn b/hurd/running.mdwn
index 15ee25d9..b3caf21a 100644
--- a/hurd/running.mdwn
+++ b/hurd/running.mdwn
@@ -17,7 +17,7 @@ There are several different ways to run a GNU/Hurd system:
* [[microkernel/mach/gnumach/ports/Xen]] - In Xen
* [[Live_CD]]
* [[QEMU]] - In QEMU
-* [[openstack]] - In openstack
+* [[cloud]] - In the "cloud": OpenStack
* [[chroots|chroot]] need a couple of tricks to work properly.
* [[VirtualBox]] - In VirtualBox
* [[vmware]] (**non-free!**)
diff --git a/hurd/running/cloud.mdwn b/hurd/running/cloud.mdwn
new file mode 100644
index 00000000..b063fd7b
--- /dev/null
+++ b/hurd/running/cloud.mdwn
@@ -0,0 +1,18 @@
+[[!meta copyright="Copyright © 2013 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]]."]]"""]]
+
+# [[!wikipedia OpenStack]]
+
+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 http://people.debian.org/~sthibault/hurd-i386/debian-hurd.img
diff --git a/hurd/running/openstack.mdwn b/hurd/running/openstack.mdwn
deleted file mode 100644
index af03583b..00000000
--- a/hurd/running/openstack.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-[[!meta copyright="Copyright © 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-2013 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]]."]]"""]]
-
-One can tell openstack 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 http://people.debian.org/~sthibault/hurd-i386/debian-hurd.img