Skip to content

Commit 5fdf3fc

Browse files
committed
Update main docs
1 parent 213e7fe commit 5fdf3fc

File tree

6 files changed

+30
-32
lines changed

6 files changed

+30
-32
lines changed

static/docs/main/_sources/images/images.rst.txt

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -443,19 +443,11 @@ Then, ``wwctl image exec`` will work regardless of the architecture of the
443443
image. For more information about QEMU, see their `GitHub
444444
<https://github.com/multiarch/qemu-user-static>`_
445445

446-
To use wwclient on a booted image using a different architecture, wwclient must
447-
be compiled for the specific architecture. This requires GOLang build tools 1.21
448-
or newer. Below is an example for building wwclient for arm64:
449-
450-
.. code-block:: console
451-
452-
# git clone https://github.com/warewulf/warewulf
453-
# cd warewulf
454-
# GOARCH=arm64 PREFIX=/ make wwclient
455-
# mkdir -p /var/lib/warewulf/overlays/wwclient_arm64/rootfs/warewulf
456-
# cp wwclient /var/lib/warewulf/overlays/wwclient_arm64/rootfs/warewulf
446+
.. note::
457447

458-
Then, apply the new "wwclient_arm64" system overlay to your arm64 node/profile
448+
When provisioning cluster nodes with a different architecture than the
449+
Warewulf server, also use the matching architecture-specific :ref:`wwclient`
450+
overlay: e.g., wwclient.x86_64 or wwclient.aarch64.
459451

460452
Read-only images
461453
================

static/docs/main/_sources/overlays/overlays.rst.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,16 +202,23 @@ provisioning actions:
202202
- **/warewulf/init.d/:** executed in the final root file system but before
203203
calling ``init``.
204204

205+
.. _wwclient:
206+
205207
wwclient
206208
--------
207209

208210
All configured overlays are provisioned initially along with the node image
209211
itself; but **wwclient** periodically fetches and applies the runtime overlay to
210212
allow configuration of some settings without a reboot.
211213

212-
wwclient will contat the ``ipaddr`` value from ``warewulf.conf`` by default.
213-
This can be overridden by specifying a ``WW_IPADDR`` environment variable, which
214-
can be set via an overlay in ``/etc/default/wwclient``.
214+
wwclient contacts the ``ipaddr`` value from ``warewulf.conf`` by default. This
215+
can be overridden by specifying a ``WW_IPADDR`` environment variable, which can
216+
be set via an overlay in ``/etc/default/wwclient``.
217+
218+
The default wwclient overlay contains a ``wwclient`` executable compiled for the
219+
same architecture as the Warewulf server. Architecture-specific wwclient.aarch64
220+
and wwclient.x86_64 overlays are available as well. This supports using wwclient
221+
on cluster nodes with a different architecture than the Warewulf server.
215222

216223
Network interfaces
217224
------------------

static/docs/main/images/images.html

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -595,17 +595,12 @@ <h2>Image Architecture<a class="headerlink" href="#image-architecture" title="Li
595595
</div>
596596
<p>Then, <code class="docutils literal notranslate"><span class="pre">wwctl</span> <span class="pre">image</span> <span class="pre">exec</span></code> will work regardless of the architecture of the
597597
image. For more information about QEMU, see their <a class="reference external" href="https://github.com/multiarch/qemu-user-static">GitHub</a></p>
598-
<p>To use wwclient on a booted image using a different architecture, wwclient must
599-
be compiled for the specific architecture. This requires GOLang build tools 1.21
600-
or newer. Below is an example for building wwclient for arm64:</p>
601-
<div class="highlight-console notranslate"><div class="highlight"><pre><span></span><span class="gp"># </span>git<span class="w"> </span>clone<span class="w"> </span>https://github.com/warewulf/warewulf
602-
<span class="gp"># </span><span class="nb">cd</span><span class="w"> </span>warewulf
603-
<span class="gp"># </span><span class="nv">GOARCH</span><span class="o">=</span>arm64<span class="w"> </span><span class="nv">PREFIX</span><span class="o">=</span>/<span class="w"> </span>make<span class="w"> </span>wwclient
604-
<span class="gp"># </span>mkdir<span class="w"> </span>-p<span class="w"> </span>/var/lib/warewulf/overlays/wwclient_arm64/rootfs/warewulf
605-
<span class="gp"># </span>cp<span class="w"> </span>wwclient<span class="w"> </span>/var/lib/warewulf/overlays/wwclient_arm64/rootfs/warewulf
606-
</pre></div>
598+
<div class="admonition note">
599+
<p class="admonition-title">Note</p>
600+
<p>When provisioning cluster nodes with a different architecture than the
601+
Warewulf server, also use the matching architecture-specific <a class="reference internal" href="../overlays/overlays.html#wwclient"><span class="std std-ref">wwclient</span></a>
602+
overlay: e.g., wwclient.x86_64 or wwclient.aarch64.</p>
607603
</div>
608-
<p>Then, apply the new “wwclient_arm64” system overlay to your arm64 node/profile</p>
609604
</section>
610605
<section id="read-only-images">
611606
<h2>Read-only images<a class="headerlink" href="#read-only-images" title="Link to this heading"></a></h2>

static/docs/main/objects.inv

9 Bytes
Binary file not shown.

static/docs/main/overlays/overlays.html

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,13 +399,17 @@ <h3>wwinit<a class="headerlink" href="#wwinit" title="Link to this heading"><
399399
</ul>
400400
</section>
401401
<section id="wwclient">
402-
<h3>wwclient<a class="headerlink" href="#wwclient" title="Link to this heading"></a></h3>
402+
<span id="id1"></span><h3>wwclient<a class="headerlink" href="#wwclient" title="Link to this heading"></a></h3>
403403
<p>All configured overlays are provisioned initially along with the node image
404404
itself; but <strong>wwclient</strong> periodically fetches and applies the runtime overlay to
405405
allow configuration of some settings without a reboot.</p>
406-
<p>wwclient will contat the <code class="docutils literal notranslate"><span class="pre">ipaddr</span></code> value from <code class="docutils literal notranslate"><span class="pre">warewulf.conf</span></code> by default.
407-
This can be overridden by specifying a <code class="docutils literal notranslate"><span class="pre">WW_IPADDR</span></code> environment variable, which
408-
can be set via an overlay in <code class="docutils literal notranslate"><span class="pre">/etc/default/wwclient</span></code>.</p>
406+
<p>wwclient contacts the <code class="docutils literal notranslate"><span class="pre">ipaddr</span></code> value from <code class="docutils literal notranslate"><span class="pre">warewulf.conf</span></code> by default. This
407+
can be overridden by specifying a <code class="docutils literal notranslate"><span class="pre">WW_IPADDR</span></code> environment variable, which can
408+
be set via an overlay in <code class="docutils literal notranslate"><span class="pre">/etc/default/wwclient</span></code>.</p>
409+
<p>The default wwclient overlay contains a <code class="docutils literal notranslate"><span class="pre">wwclient</span></code> executable compiled for the
410+
same architecture as the Warewulf server. Architecture-specific wwclient.aarch64
411+
and wwclient.x86_64 overlays are available as well. This supports using wwclient
412+
on cluster nodes with a different architecture than the Warewulf server.</p>
409413
</section>
410414
<section id="network-interfaces">
411415
<h3>Network interfaces<a class="headerlink" href="#network-interfaces" title="Link to this heading"></a></h3>
@@ -489,7 +493,7 @@ <h3>ssh<a class="headerlink" href="#ssh" title="Link to this heading"></a></h
489493
</ul>
490494
</section>
491495
<section id="syncuser">
492-
<span id="id1"></span><h3>syncuser<a class="headerlink" href="#syncuser" title="Link to this heading"></a></h3>
496+
<span id="id2"></span><h3>syncuser<a class="headerlink" href="#syncuser" title="Link to this heading"></a></h3>
493497
<p>The <strong>syncuser</strong> overlay updates <code class="docutils literal notranslate"><span class="pre">/etc/passwd</span></code> and <code class="docutils literal notranslate"><span class="pre">/etc/group</span></code> to include
494498
all users on both the Warewulf server and from the image.</p>
495499
<p>To function properly, <code class="docutils literal notranslate"><span class="pre">wwctl</span> <span class="pre">image</span> <span class="pre">syncuser</span></code> (or the <code class="docutils literal notranslate"><span class="pre">--syncuser</span></code> option
@@ -544,7 +548,7 @@ <h3>debug<a class="headerlink" href="#debug" title="Link to this heading"></a
544548
</div>
545549
</section>
546550
<section id="localtime">
547-
<span id="id2"></span><h3>localtime<a class="headerlink" href="#localtime" title="Link to this heading"></a></h3>
551+
<span id="id3"></span><h3>localtime<a class="headerlink" href="#localtime" title="Link to this heading"></a></h3>
548552
<p>The <strong>localtime</strong> overlay configures the timezone of a cluster node to match
549553
that of the Warewulf server; alternatively, a different timezone may be
550554
specified with a <code class="docutils literal notranslate"><span class="pre">localtime</span></code> tag.</p>

static/docs/main/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)