svn commit: r40482 - head/en_US.ISO8859-1/articles/portbuild

[Mark Linimon]

Author: linimon
Date: Fri Dec 28 03:11:47 2012
New Revision: 40482
URL: http://svnweb.freebsd.org/changeset/doc/40482

Log:
  Fold the pointyhat-zfs-volume sect2 into the portbuild-repo-setup sect2,
  because a new script tools/mkportbuild helps to automate several of the
  tasks.
  
  Some of the broken whitespace will be fixed in a followup commit.

Modified:
  head/en_US.ISO8859-1/articles/portbuild/article.xml

Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.xml	Thu Dec 27 14:21:08 2012	(r40481)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Fri Dec 28 03:11:47 2012	(r40482)
@@ -2614,7 +2614,7 @@ sysutils/zfs-stats</programlisting>
     </sect2>
 
     <sect2 id="pointyhat-zfs-volume">
-      <title>Configuring the zfs volume</title>
+      <title>Configuring the zfs volume and setting up the repository</title>
 
       <para>The following steps need to be done as euid root.</para>
 
@@ -2633,11 +2633,13 @@ sysutils/zfs-stats</programlisting>
 	  <screen>&prompt.root; export ZFS_MOUNTPOINT=/<replaceable>a</replaceable></screen>
 	</step>
 
+<!--
 	<step>
 	  <para>Create the mountpoint.</para>
 
 	  <screen>&prompt.root; mkdir -p ${ZFS_MOUNTPOINT}</screen>
 	</step>
+-->
 
 	<step>
 	  <para>Create the <application>zfs</application> volume
@@ -2648,8 +2650,10 @@ sysutils/zfs-stats</programlisting>
 
 	    <screen>&prompt.root; zpool create ${ZFS_VOLUME} mirror da1 da2 mirror da3 da4 mirror da5 da6 mirror da7 da8</screen>
 	  </example>
+<!--
 	</step>
       </procedure>
+-->
 
       <note>
 	<para>We will define a <application>zfs</application>
@@ -2657,7 +2661,9 @@ sysutils/zfs-stats</programlisting>
 	  <replaceable>portbuild</replaceable> user may administer this
 	  volume without having to have root privileges.</para>
       </note>
+	</step>
 
+<!--
     </sect2>
 
     <sect2 id="portbuild-repo-setup">
@@ -2666,6 +2672,7 @@ sysutils/zfs-stats</programlisting>
       <para>The following steps need to be done as euid root.</para>
 
       <procedure>
+-->
 	<step>
 	  <para>Select an <application>svn</application> repository
 	    and export it.  See the
@@ -2676,6 +2683,26 @@ sysutils/zfs-stats</programlisting>
 	</step>
 
 	<step>
+	  <para>Obtain a copy of the kickstart script into a
+	    temporary directory.  (You will not need to keep this
+	    directory later.)</para>
+
+	  <screen>&prompt.root; mkdir -p /home/<replaceable>portbuild</replaceable>/<replaceable>tmp</replaceable>
+&prompt.root; cd /home/<replaceable>portbuild</replaceable>/<replaceable>tmp</replaceable>
+&prompt.root; svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/tools <replaceable>tmp</replaceable></screen>
+	</step>
+
+	<step>
+	  <para>Run the kickstart script:</para>
+
+	  <screen>&prompt.root; sh /home/<replaceable>portbuild</replaceable>/<replaceable>tmp</replaceable>/mkportbuild</screen>
+
+	  <para>This will accomplish all the following 4 steps:</para>
+
+	  <procedure>
+
+<!-- begin of whitespace-broken area -->
+	<step>
 	  <para>Create the <filename>portbuild</filename> directory:</para>
 
 	  <screen>&prompt.root; mkdir -p ${ZFS_MOUNTPOINT}/portbuild</screen>
@@ -2700,17 +2727,23 @@ sysutils/zfs-stats</programlisting>
 	      of hardcoded paths.  This is a bug.</para>
 	  </note>
 	</step>
+<!--
       </procedure>
 
       <para>The next step needs to be done as the
 	<replaceable>portbuild</replaceable> user.</para>
 
       <procedure>
+-->
 	<step>
 	  <para>set up the repository:</para>
 
 	  <screen>&prompt.user; svn checkout ${VCS_REPOSITORY}/base/projects/portbuild ${ZFS_MOUNTPOINT}/portbuild</screen>
 	</step>
+<!-- end of whitespace-broken area -->
+
+	  </procedure>
+
       </procedure>
     </sect2>