From f2e29df58193336fea026f1a48ccdacbec117544 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@suse.de>
Date: Mon, 25 Aug 2014 07:47:00 +0000
Subject: [PATCH] Update appendix about Windows support following Windows 2012
 R2 support

https://bugzilla.novell.com/show_bug.cgi?id=893140


git-svn-id: http://svn.suse.de/svn/doc/trunk/cloud/en@59499 2463f871-af05-0410-bd21-ebfa852e3ce4
---
 xml/depl_hyperv.xml | 69 ++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/xml/depl_hyperv.xml b/xml/depl_hyperv.xml
index 365c77666..c6534d2ce 100644
--- a/xml/depl_hyperv.xml
+++ b/xml/depl_hyperv.xml
@@ -12,10 +12,11 @@
 <appendix id="app.deploy.hyperv">
  <title>Setting up a Netboot Environment for Microsoft* Windows</title>
  <para>
-  Setting up &compnode;s running Microsoft &hyper; Server or Windows Server
-  2012 requires to configure the &admserv; to be able to provide the netboot
-  environment for node installation. The environment is generated from a
-  machine running Microsoft &hyper; Server or Microsoft Windows Server 2012.
+  Setting up &compnode;s running Microsoft Windows Server 2012 R2, Microsoft
+  Windows Server 2012, Microsoft &hyper; Server 2012 R2 or Microsoft &hyper;
+  Server 2012 requires to configure the &admserv; to be able to provide the
+  netboot environment for node installation. The environment is generated from
+  a machine running Microsoft Windows Server or Microsoft &hyper; Server.
  </para>
  <sect1 id="app.deploy.hyperv.requirements">
   <title>Requirements</title>
@@ -28,14 +29,15 @@
   <itemizedlist>
    <listitem>
     <para>
-     Provide a separate machine running Microsoft Windows Server 2012 or
-     Microsoft &hyper; Server. The machine must be able to access the
+     Provide a separate machine running Microsoft Windows Server 2012 R2,
+     Microsoft Windows Server 2012, Microsoft &hyper; Server 2012 R2 or
+     Microsoft &hyper; Server 2012. The machine must be able to access the
      &admserv; and the Internet.
     </para>
    </listitem>
    <listitem>
     <para>
-     Install Samba (package <systemitem class="resource">samba</systemitem>
+     Install Samba (package <systemitem class="resource">samba</systemitem>)
      and the Microsoft &hyper; tools (package <systemitem
      class="resource">hyper-v</systemitem>) on the &admserv;.
     </para>
@@ -61,24 +63,10 @@
      linkend="app.deploy.hyperv.requirements"/> are met.
     </para>
    </step>
-   <step>
-    <para>
-     This step is only required if you are running &hyper; Server&mdash;skip
-     it, if you are running Windows Server 2012.
-    </para>
-    <para>
-     Add the following line to the <filename>/etc/fstab</filename>:
-    </para>
-    <screen>/srv/tftpboot/hyperv-6.2 /srv/tftpboot/windows-6.2 bind bind</screen>
-    <para>
-     and mount the directory you added:
-    </para>
-    <screen>mount /srv/tftpboot/windows-6.2</screen>
-   </step>
    <step>
     <para>
      If you have more than one hard disk, edit
-     <filename>/srv/tftpboot/adk-tools/build_winpe.ps1</filename>and adjust
+     <filename>/srv/tftpboot/adk-tools/build_winpe.ps1</filename> and adjust
      the value for <literal>$install_media</literal> accordingly.
     </para>
    </step>
@@ -121,15 +109,15 @@ rcnmb start</screen>
 
   <para>
    Once Samba is properly configured on the &admserv;, log in to the machine
-   running Microsoft Windows Server 2012 or Microsoft &hyper; Server and
-   generate the environment:
+   running Microsoft Windows Server or Microsoft &hyper; Server and generate
+   the environment:
   </para>
 
   <procedure>
    <title>Netboot Environment Generation</title>
    <step>
     <para>
-     Log in to the Microsoft Windows Server 2012 or Microsoft &hyper; Server
+     Log in to the Microsoft Windows Server or Microsoft &hyper; Server
      machine. Connect the device name <literal>X:</literal> to the Samba
      share <filename>\\crowbar\reminst</filename> configured on the
      &admserv; (which is named <literal>crowbar</literal> by default) in the
@@ -142,15 +130,18 @@ rcnmb start</screen>
     <para>
      Device <literal>X:</literal> contains a directory
      <filename>X:\adk-tools</filename> with image creation scripts for
-     either &hyper; (<filename>build_winpe_hyperv-6.2.ps1</filename>) or
-     Windows Server (<filename>build_winpe_windows-6.2.ps1</filename>).
+     either Windows Server 2012 R2
+     <filename>build_winpe_windows-6.3.ps1</filename>), Windows Server 2012
+     (<filename>build_winpe_windows-6.2.ps1</filename>), &hyper; Server 2012 R2
+     (<filename>build_winpe_hyperv-6.3.ps1</filename>) or &hyper; Server 2012
+     (<filename>build_winpe_hyperv-6.2.ps1</filename>).
      Build the image by running the following commands on the command line:
     </para>
     <variablelist>
      <varlistentry>
-      <term>&hyper; Server</term>
+      <term>Windows Server 2012 R2</term>
       <listitem>
-<screen>powershell -ExecutionPolicy Bypass x:\adk-tools\build_winpe_hyperv-6.2.ps1</screen>
+<screen>powershell -ExecutionPolicy Bypass x:\adk-tools\build_winpe_windows-6.3.ps1</screen>
       </listitem>
      </varlistentry>
      <varlistentry>
@@ -159,6 +150,18 @@ rcnmb start</screen>
 <screen>powershell -ExecutionPolicy Bypass x:\adk-tools\build_winpe_windows-6.2.ps1</screen>
       </listitem>
      </varlistentry>
+     <varlistentry>
+      <term>&hyper; Server 2012 R2</term>
+      <listitem>
+<screen>powershell -ExecutionPolicy Bypass x:\adk-tools\build_winpe_hyperv-6.3.ps1</screen>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term>&hyper; Server 2012</term>
+      <listitem>
+<screen>powershell -ExecutionPolicy Bypass x:\adk-tools\build_winpe_hyperv-6.2.ps1</screen>
+      </listitem>
+     </varlistentry>
     </variablelist>
     <para>
      Executing the script requires Internet access, because additional
@@ -169,9 +172,11 @@ rcnmb start</screen>
 
   <para>
    After the netboot environment is set up, you can choose either
-   <guimenu>Windows Server 2012</guimenu> or <guimenu>Hyper-V Server
-   2012</guimenu> as the <guimenu>Target Platform</guimenu> for newly
-   discovered nodes from the <guimenu>Node Dashboard</guimenu>.
+   <guimenu>Windows Server 2012 R2</guimenu>, <guimenu>Windows Server
+   2012</guimenu>, <guimenu>Hyper-V Server 2012 R2</guimenu> or
+   <guimenu>Hyper-V Server 2012</guimenu> as the <guimenu>Target
+   Platform</guimenu> for newly discovered nodes from the <guimenu>Node
+   Dashboard</guimenu>.
   </para>
  </sect1>
 </appendix>