From a425810f5fb42a8f1407b2bd0ed4578f0a07e025 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Wed, 12 May 2010 09:40:15 +0100
Subject: [PATCH] install.rst: update os version and add KVM notes

The 0.7 version was just an example, but since we're on 0.9 now,
updating the number cannot be wrong. The new admonition helps KVM users
to configure debootstrap correctly so that instances can be shutdown
cleanly.

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 doc/install.rst | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/doc/install.rst b/doc/install.rst
index b1a2f685e..68d38945d 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -470,13 +470,13 @@ To be able to install instances you need to have an Operating System
 installation script. An example OS that works under Debian and can
 install Debian and Ubuntu instace OSes is provided on the project web
 site.  Download it from the project page and follow the instructions in
-the ``README`` file.  Here is the installation procedure (replace 0.7
+the ``README`` file.  Here is the installation procedure (replace 0.9
 with the latest version that is compatible with your ganeti version)::
 
   cd /usr/local/src/
-  wget http://ganeti.googlecode.com/files/ganeti-instance-debootstrap-0.7.tar.gz
-  tar xzf ganeti-instance-debootstrap-0.7.tar.gz
-  cd ganeti-instance-debootstrap-0.7
+  wget http://ganeti.googlecode.com/files/ganeti-instance-debootstrap-0.9.tar.gz
+  tar xzf ganeti-instance-debootstrap-0.9.tar.gz
+  cd ganeti-instance-debootstrap-0.9
   ./configure
   make
   make install
@@ -494,6 +494,20 @@ installed.
 
      apt-get install debootstrap dump kpartx
 
+.. admonition:: KVM
+
+   In order for debootstrap instances to be able to shutdown cleanly
+   they must install have basic acpi support inside the instance. Which
+   packages are needed depend on the exact flavor of debian or ubuntu
+   which you're installing, but the example defaults file has a
+   commented out configuration line that works for debian lenny and
+   squeeze::
+
+     EXTRA_PKGS="acpi-support-base,console-tools,udev"
+
+   kbd can be used instead of console-tools, and more packages can be
+   added, of course, if needed.
+
 Alternatively, you can create your own OS definitions. See the manpage
 :manpage:`ganeti-os-interface`.
 
-- 
GitLab