documenting static host IP assignments

* docs/formatnetwork.html docs/formatnetwork.html.in: patch from
  Charles Duffy documenting static host IP assignments.
daniel

diff --git a/ChangeLog b/ChangeLog
index 79f91e478c59361464df944b7f1312f55cdffb80..dcfb9745f5c4c68e0e328539a3a97da055fa396a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 25 21:00:46 CET 2009 Daniel Veillard <veillard@redhat.com>
+
+       * docs/formatnetwork.html docs/formatnetwork.html.in: patch from
+         Charles Duffy documenting static host IP assignments.
+
 Tue Feb 24 14:55:28 GMT 2009 Mark McLoughlin <markmc@redhat.com>
 
        * tests/nodedevxml2xmltest.c: Add a test to check node

diff --git a/docs/formatnetwork.html b/docs/formatnetwork.html
index faebbb90cddf00684238db52ea1096059cc530ac..59539c2af774f400d91d772bafac81351e43e838 100644 (file)
--- a/docs/formatnetwork.html
+++ b/docs/formatnetwork.html
@@ -211,7 +211,9 @@
         ...
        <ip address="192.168.122.1" netmask="255.255.255.0">
          <dhcp>
-           <range start="192.168.122.2" end="192.168.122.254" />
+           <range start="192.168.122.100" end="192.168.122.254" />
+           <host mac="00:16:3e:77:e2:ed" name="foo.example.com" ip="192.168.122.10" />
+           <host mac="00:16:3e:3e:a9:1a" name="bar.example.com" ip="192.168.122.11" />
          </dhcp>
        </ip>
       &lt;/network&gt;</pre>
@@ -231,6 +233,14 @@
        IPv4 addresses to be provided to DHCP clients. These two addresses
        must lie within the scope of the network defined on the parent
        <code>ip</code> element.  <span class="since">Since 0.3.0</span>
+      </dd><dt><code>host</code></dt><dd>Within the <code>dhcp</code> element there may be zero or more
+       <code>host</code> elements; these specify hosts which will be given
+        names and predefined IP addresses by the built-in DHCP server. Any
+        such element must specify the MAC address of the host to be assigned
+       a given name (via the <code>mac</code> attribute), the IP to be
+        assigned to that host (via the <code>ip</code> attribute), and the
+       name to be given that host by the DHCP server (via the
+        <code>name</code> attribute).  <span class="since">Since 0.4.5</span>
       </dd></dl>
         <h2>
           <a name="examples" id="examples">Example configuration</a>

diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in
index ca37b05f5950d43ac306195b548ad47c038a961b..fd6843004a9b4af741678e7a89e607f660210c7e 100644 (file)
--- a/docs/formatnetwork.html.in
+++ b/docs/formatnetwork.html.in
@@ -98,7 +98,9 @@
         ...
        <ip address="192.168.122.1" netmask="255.255.255.0">
          <dhcp>
-           <range start="192.168.122.2" end="192.168.122.254" />
+           <range start="192.168.122.100" end="192.168.122.254" />
+           <host mac="00:16:3e:77:e2:ed" name="foo.example.com" ip="192.168.122.10" />
+           <host mac="00:16:3e:3e:a9:1a" name="bar.example.com" ip="192.168.122.11" />
          </dhcp>
        </ip>
       &lt;/network&gt;</pre>
@@ -126,6 +128,16 @@
        must lie within the scope of the network defined on the parent
        <code>ip</code> element.  <span class="since">Since 0.3.0</span>
       </dd>
+      <dt><code>host</code></dt>
+      <dd>Within the <code>dhcp</code> element there may be zero or more
+       <code>host</code> elements; these specify hosts which will be given
+        names and predefined IP addresses by the built-in DHCP server. Any
+        such element must specify the MAC address of the host to be assigned
+       a given name (via the <code>mac</code> attribute), the IP to be
+        assigned to that host (via the <code>ip</code> attribute), and the
+       name to be given that host by the DHCP server (via the
+        <code>name</code> attribute).  <span class="since">Since 0.4.5</span>
+      </dd>
     </dl>
 
     <h2><a name="examples">Example configuration</a></h2>