X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=doc%2Fconfiguration.html;h=ccaff8e849e82d177496d307288a0bcb7c6012cb;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=5fced83be59d59d10505def3dcbf73172098ca3a;hpb=3b34449070c0846fdc49436d1edd5916512f1644;p=util-vserver.git

diff --git a/doc/configuration.html b/doc/configuration.html
index 5fced83..ccaff8e 100644
--- a/doc/configuration.html
+++ b/doc/configuration.html
@@ -23,6 +23,29 @@
             <div class="description">
 A link to the directory which will hold cached information about
 vservers.
+      </div>
+          </li>
+          <li>
+            <span class="boolean" title="/etc/vservers/.defaults/context.dynamic">context.dynamic</span>
+            <br />
+            <div class="description">
+If this file exists, kernel-side dynamic contexts will be used by the "vserver
+... build" command. Otherwise a context will be generated, based on the
+contents of <a class="optionref" href="#context.next">context.next</a>.
+      </div>
+          </li>
+          <li id="context.next">
+            <span class="file" title="/etc/vservers/.defaults/context.next">context.next</span>
+            <br />
+            <div class="description">
+The context id to use for the next guest created by "vserver ... build".
+      </div>
+          </li>
+          <li>
+            <span class="data" title="/etc/vservers/.defaults/fstab">fstab</span>
+            <br />
+            <div class="description">
+The default fstab file to put in newly built guests.
       </div>
           </li>
           <li id="global-namespace-cleanup-skip">
@@ -64,6 +87,15 @@ to VSERVER mapping; Under kernel 2.6 it is unused.
 
 NOTE: this link exists in 0.30.202+ only; in previous versions it was
 a vserver specific setting.
+      </div>
+          </li>
+          <li>
+            <span class="file" title="/etc/vservers/.defaults/shell">shell</span>
+            <br />
+            <div class="description">
+Contains the pathname of the shell which will be used by the "vserver
+... enter" command. Can be overridden by the
+<a class="optionref" href="#shell">per-guest shell</a>.
       </div>
           </li>
           <li>
@@ -75,6 +107,19 @@ a vserver specific setting.
             <span class="directory">/etc/vservers/<span class="">.defaults</span>/<span class="">apps</span></span>
             <br />
             <ul>
+              <li>
+                <span class="directory">/etc/vservers/<span class="">.defaults</span>/<span class="">apps</span>/<span class="">build</span></span>
+                <br />
+                <ul>
+                  <li>
+                    <span class="list" title="/etc/vservers/.defaults/apps/build/options">options</span>
+                    <br />
+                    <div class="description">
+A list of default options to supply to vserver ... build, one option per line.
+          </div>
+                  </li>
+                </ul>
+              </li>
               <li>
                 <span class="directory">/etc/vservers/<span class="">.defaults</span>/<span class="">apps</span>/<span class="">debootstrap</span></span>
                 <br />
@@ -135,6 +180,52 @@ distribution specific configuration file.
                   </li>
                 </ul>
               </li>
+              <li>
+                <span class="directory">/etc/vservers/<span class="">.defaults</span>/<span class="">apps</span>/<span class="">vdevmap</span></span>
+                <br />
+                <ul>
+                  <li>
+                    <span class="directory">/etc/vservers/<span class="">.defaults</span>/<span class="">apps</span>/<span class="">vdevmap</span>/<span class="sybmolic">x</span></span>
+                    <br />
+                    <div class="description">'x' is an arbitrary name, replace it with e.g. device names</div>
+                    <ul>
+                      <li>
+                        <span class="boolean" title="/etc/vservers/.defaults/apps/vdevmap/x/create">create</span>
+                        <br />
+                        <div class="description">When this file exists, the device can be created (if the guest has <a class="optionref" href="#bcapabilities">CAP_MKNOD</a>)</div>
+                      </li>
+                      <li>
+                        <span class="file" title="/etc/vservers/.defaults/apps/vdevmap/x/device">device</span>
+                        <br />
+                        <div class="description">Contains the name of a device node</div>
+                      </li>
+                      <li>
+                        <span class="file" title="/etc/vservers/.defaults/apps/vdevmap/x/flags">flags</span>
+                        <br />
+                        <div class="description">This file will let you specify unimplemented flags manually</div>
+                      </li>
+                      <li>
+                        <span class="boolean" title="/etc/vservers/.defaults/apps/vdevmap/x/open">open</span>
+                        <br />
+                        <div class="description">When this file exists, the device can be opened</div>
+                      </li>
+                      <li id="vdevmap-remap">
+                        <span class="boolean" title="/etc/vservers/.defaults/apps/vdevmap/x/remap">remap</span>
+                        <br />
+                        <div class="description">
+When this file exists, <a class="optionref" href="#vdevmap-target">target</a> will
+have to exist as well and opening the device will in fact open the target device
+            </div>
+                      </li>
+                      <li id="vdevmap-target">
+                        <span class="file" title="/etc/vservers/.defaults/apps/vdevmap/x/target">target</span>
+                        <br />
+                        <div class="description">Contains the device node of the target node to open instead of the device when <a class="optionref" href="#vdevmap-remap">remap</a> is set</div>
+                      </li>
+                    </ul>
+                  </li>
+                </ul>
+              </li>
               <li>
                 <span class="directory">/etc/vservers/<span class="">.defaults</span>/<span class="">apps</span>/<span class="">vlogin</span></span>
                 <br />
@@ -208,7 +299,7 @@ skipped.
                         <span class="script" title="/etc/vservers/.defaults/apps/vshelper/vshelper-methods/$handler">handler</span>
                         <br />
                         <div class="description">
-See vshelper/action.
+See <a class="optionref" href="#vshelper-action">vshelper/action</a>.
             </div>
                       </li>
                     </ul>
@@ -270,6 +361,53 @@ filesystem.
               </li>
             </ul>
           </li>
+          <li>
+            <span class="directory">/etc/vservers/<span class="">.defaults</span>/<span class="">files</span></span>
+            <br />
+            <div class="description">This directory contains some files which will be copied to the guests during build.</div>
+            <ul>
+              <li>
+                <span class="data" title="/etc/vservers/.defaults/files/hosts">hosts</span>
+                <br />
+                <div class="description">The default /etc/hosts file.</div>
+              </li>
+              <li>
+                <span class="data" title="/etc/vservers/.defaults/files/krb.conf">krb.conf</span>
+                <br />
+                <div class="description">The default /etc/krb.conf file.</div>
+              </li>
+              <li>
+                <span class="data" title="/etc/vservers/.defaults/files/krb.realms">krb.realms</span>
+                <br />
+                <div class="description">The default /etc/krb.realms file.</div>
+              </li>
+              <li>
+                <span class="data" title="/etc/vservers/.defaults/files/krb5.conf">krb5.conf</span>
+                <br />
+                <div class="description">The default /etc/krb5.conf file.</div>
+              </li>
+              <li>
+                <span class="data" title="/etc/vservers/.defaults/files/ldap.conf">ldap.conf</span>
+                <br />
+                <div class="description">The default /etc/ldap.conf file.</div>
+              </li>
+              <li>
+                <span class="data" title="/etc/vservers/.defaults/files/localtime">localtime</span>
+                <br />
+                <div class="description">The default /etc/localtime file.</div>
+              </li>
+              <li>
+                <span class="data" title="/etc/vservers/.defaults/files/nsswitch.conf">nsswitch.conf</span>
+                <br />
+                <div class="description">The default /etc/nsswitch.conf file.</div>
+              </li>
+              <li>
+                <span class="data" title="/etc/vservers/.defaults/files/resolv.conf">resolv.conf</span>
+                <br />
+                <div class="description">The default /etc/resolv.conf file.</div>
+              </li>
+            </ul>
+          </li>
           <li>
             <span class="directory">/etc/vservers/<span class="">.defaults</span>/<span class="fixed">init</span></span>
             <br />
@@ -593,7 +731,7 @@ See the <a href="http://linux-vserver.org/Scheduler+Parameters">Linux
 VServer Wiki</a> for more information about this file.
       </div>
           </li>
-          <li>
+          <li id="shell">
             <span class="file" title="/etc/vservers/$vserver-name/shell">shell</span>
             <br />
             <div class="description">
@@ -744,7 +882,7 @@ from/to at startup via initscript.
                 <span class="directory">/etc/vservers/<span class="symbolic">vserver-name</span>/<span class="">apps</span>/<span class="">vshelper</span></span>
                 <br />
                 <ul>
-                  <li>
+                  <li id="vshelper-action">
                     <span class="file" title="/etc/vservers/$vserver-name/apps/vshelper/action">action</span>
                     <br />
                     <div class="description">
@@ -807,7 +945,7 @@ skipped.
                     <span class="script" title="/etc/vservers/$vserver-name/apps/vshelper-methods/$handler">handler</span>
                     <br />
                     <div class="description">
-See vshelper/action.
+See <a class="optionref" href="#vshelper-action">vshelper/action</a>.
           </div>
                   </li>
                 </ul>
@@ -1430,6 +1568,29 @@ the configuration directory will be made the working directory.
               </li>
             </ul>
           </li>
+          <li>
+            <span class="directory">/etc/vservers/<span class="symbolic">vserver-name</span>/<span class="">sysctl</span></span>
+            <br />
+            <ul>
+              <li>
+                <span class="directory">/etc/vservers/<span class="symbolic">vserver-name</span>/<span class="">sysctl</span>/<span class="symbolic">x</span></span>
+                <br />
+                <div class="description">'x' is an arbitrary name, replace it with e.g. integers</div>
+                <ul>
+                  <li>
+                    <span class="file" title="/etc/vservers/$vserver-name/sysctl/$x/setting">setting</span>
+                    <br />
+                    <div class="description">The sysctl setting</div>
+                  </li>
+                  <li>
+                    <span class="file" title="/etc/vservers/$vserver-name/sysctl/$x/value">value</span>
+                    <br />
+                    <div class="description">The value</div>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </li>
           <li>
             <span class="directory">/etc/vservers/<span class="symbolic">vserver-name</span>/<span class="">ulimits</span></span>
             <br />