From 4fe64948813ce1955bde09abc8c9aa8f8c81d831 Mon Sep 17 00:00:00 2001
From: Joe Brockmeier <jzb@zonker.net>
Date: Fri, 7 Dec 2012 08:46:32 -0600
Subject: [PATCH] CLOUDSTACK-480: Adding mention to install nfs-kernel-server
 to Install Guide

---
 ...l~432ff7ecbe1efface7fedf482be8a89518f3cd33 | 31 +++++++++++++++++++
 docs/en-US/hypervisor-installation.xml~HEAD   | 31 +++++++++++++++++++
 .../en-US/nfs-shares-on-management-server.xml |  7 ++++-
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 docs/en-US/hypervisor-installation.xml~432ff7ecbe1efface7fedf482be8a89518f3cd33
 create mode 100644 docs/en-US/hypervisor-installation.xml~HEAD

diff --git a/docs/en-US/hypervisor-installation.xml~432ff7ecbe1efface7fedf482be8a89518f3cd33 b/docs/en-US/hypervisor-installation.xml~432ff7ecbe1efface7fedf482be8a89518f3cd33
new file mode 100644
index 00000000000..b0fc9f46ddb
--- /dev/null
+++ b/docs/en-US/hypervisor-installation.xml~432ff7ecbe1efface7fedf482be8a89518f3cd33
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<chapter id="hypervisor-installation">
+    <title>Hypervisor Installation</title>
+    <xi:include href="hypervisor-kvm-install-flow.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="citrix-xenserver-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="vmware-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <!--    <xi:include href="ovm-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -->
+</chapter>
diff --git a/docs/en-US/hypervisor-installation.xml~HEAD b/docs/en-US/hypervisor-installation.xml~HEAD
new file mode 100644
index 00000000000..b0fc9f46ddb
--- /dev/null
+++ b/docs/en-US/hypervisor-installation.xml~HEAD
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<chapter id="hypervisor-installation">
+    <title>Hypervisor Installation</title>
+    <xi:include href="hypervisor-kvm-install-flow.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="citrix-xenserver-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="vmware-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <!--    <xi:include href="ovm-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -->
+</chapter>
diff --git a/docs/en-US/nfs-shares-on-management-server.xml b/docs/en-US/nfs-shares-on-management-server.xml
index 2c9b324d1a2..c000ce4818d 100644
--- a/docs/en-US/nfs-shares-on-management-server.xml
+++ b/docs/en-US/nfs-shares-on-management-server.xml
@@ -23,10 +23,15 @@
 -->
 
 <section id="nfs-shares-on-management-server">
-    <title>Using the Management Server As the NFS Server</title>
+    <title>Using the Management Server as the NFS Server</title>
     <para>This section tells how to set up NFS shares for primary and secondary storage on the same node with the Management Server.  This is more typical of a trial installation, but is technically possible in a larger deployment. It is assumed that you will have less than 16TB of storage on the host.</para> 
     <para>The exact commands for the following steps may vary depending on your operating system version.</para>
     <orderedlist>
+        <listitem><para>On Ubuntu/Debian systems, you'll need to install the nfs-kernel-server package:</para>
+        <programlisting>
+$ sudo apt-get install nfs-kernel-server
+        </programlisting>
+        </listitem>
         <listitem><para>On the Management Server host, create two directories that you will use for primary and secondary storage. For example:</para>
         <programlisting>
 # mkdir -p /export/primary