From adbd8b71680bdab37a5f8415d69a924133376a2a Mon Sep 17 00:00:00 2001
From: Frank Sundermeyer <fs@suse.de>
Date: Mon, 5 May 2014 12:29:50 +0000
Subject: [PATCH] Fix for bnc #874171 ([doc] be clearer that copying files from
 ISOs is not required)

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

diff --git a/xml/depl_inst_admin.xml b/xml/depl_inst_admin.xml
index 2fd4401ef..366672f84 100644
--- a/xml/depl_inst_admin.xml
+++ b/xml/depl_inst_admin.xml
@@ -916,13 +916,13 @@ smt-mirror -L /var/log/smt/smt-mirror_ha.log</screen>
     <title>Product Repositories</title>
     <para>
      The files in the product repositories for &sls; and &cloud; do not
-     change, therefore they do not need to be synced with a remote source.
-     It is sufficient (and recommended) to copy the data once, either from a
-     remote host or directly from the installation media. Alternatively you
-     may mount the product repository from a remote server via
-     <literal>NFS</literal>. Note that the data
-     <emphasis>must</emphasis> be directly available from the local
-     directories listed below. It is not possible to use links.
+     change, therefore they do not need to be synced with a remote source.  It
+     is sufficient to either copy the data (from a remote host or the
+     installation media) or mount the product repository from a remote server
+     via <literal>NFS</literal>. Alternatively you may copy the iso images of
+     DVD1 from both products to the admin node and <quote>loop mount</quote>
+     them. Note that the data <emphasis>must</emphasis> be directly available
+     from the local directories listed below. It is not possible to use links.
     </para>
     <para>
      While the &sls; product repository must be made available locally, the
@@ -933,7 +933,8 @@ smt-mirror -L /var/log/smt/smt-mirror_ha.log</screen>
     </para>
     <para>
      The following product repositories need to be available for
-     &productname; deployment:
+     &productname; deployment. Make sure to create these directories prior to
+     copying or mounting the data:
     </para>
     <table>
      <title>Local Product Repositories for &cloud;</title>
@@ -990,8 +991,7 @@ smt-mirror -L /var/log/smt/smt-mirror_ha.log</screen>
       it first (for example, after inserting the DVD in the &admserv; and
       waiting for the device to become ready):
      </para>
-<screen>mkdir -p /srv/tftpboot/suse-11.3/install/
-mount /dev/dvd /mnt
+<screen>mount /dev/dvd /mnt
 rsync -avP /mnt/ /srv/tftpboot/suse-11.3/install/
 umount /mnt</screen>
      <para>
@@ -999,8 +999,7 @@ umount /mnt</screen>
       available at <filename>/srv/tftpboot/repos/Cloud/</filename> the same
       way:
      </para>
-<screen>mkdir -p /srv/tftpboot/repos/Cloud/
-mount /dev/dvd /mnt
+<screen>mount /dev/dvd /mnt
 rsync -avP /mnt/ /srv/tftpboot/repos/Cloud/
 umount /mnt</screen>
     </sect4>
@@ -1020,15 +1019,32 @@ umount /mnt</screen>
       way:
      </para>
      <screen>rsync -avPz /data/Cloud/ <replaceable>192.168.124.10</replaceable>:/srv/tftpboot/repos/Cloud/</screen>
-     <note>
-      <title>Target directories must exist</title>
-      <para>
-       Make sure the target directories for the rsync commands
-       (<filename>/srv/tftpboot/suse-11.3/install/</filename> and
-       <filename>/srv/tftpboot/repos/Cloud/</filename>) exist on the &admserv;
-       prior to executing rsync.
-      </para>
-     </note>
+    </sect4>
+    <sect4 id="sec.depl.inst.admserv.post.local_repos.product.media.nfs">
+     <title>Mounting from an NFS Share</title>
+     <para>
+      If the SLES installation data is provided via NFS by a remote machine,
+      mount them as follows:
+     </para>
+     <screen>mount -t nfs <replaceable>nfs.&exampledomain;:/exports/SLES-11-SP3/x86_64/DVD1/</replaceable> /srv/tftpboot/suse-11.3/install
+mount -t nfs <replaceable>nfs.&exampledomain;:/exports/SUSE-CLOU/DVD1/</replaceable> /srv/tftpboot/repos/Cloud</screen>
+     <para>
+      To automatically mount these directories either create entries in
+      <filename>/etc/fstab</filename> or set up the automounter.
+     </para>
+    </sect4>
+    <sect4 id="sec.depl.inst.admserv.post.local_repos.product.media.iso">
+     <title>Mounting ISO Images</title>
+     <para>
+      The product repositories can also be made available by copying the iso
+      images of DVD1 to the &admserv; and mounting them:
+     </para>
+     <screen>mount -o loop <replaceable>/local/SLES-11-SP3-DVD-x86_64-DVD1.iso</replaceable> /srv/tftpboot/suse-11.3/install
+mount -o loop <replaceable>/local/SUSE-CLOUD-3-DVD1.iso</replaceable> /srv/tftpboot/repos/Cloud</screen>
+     <para>
+      To automatically mount these directories either create entries in
+      <filename>/etc/fstab</filename> or set up the automounter.
+     </para>
     </sect4>
    </sect3>
    <sect3 id="sec.depl.inst.admserv.post.local_repos.update">