Changeset 2474

Show
Ignore:
Timestamp:
01/25/07 14:14:33 (2 years ago)
Author:
dhozac
Message:

Add entries that were missing from .defaults.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/doc/configuration.xml

    r2463 r2474  
    6363      </description> 
    6464    </link> 
     65 
     66    <scalar name="shell"> 
     67      <description> 
     68Contains the pathname of the shell which will be used by the "vserver 
     69... enter" command. Can be overridden by the 
     70<optionref ref="shell">per-guest shell</optionref>. 
     71      </description> 
     72    </scalar> 
     73 
     74    <data name="fstab"> 
     75      <description> 
     76The default fstab file to put in newly built guests. 
     77      </description> 
     78    </data> 
    6579     
    6680    <collection name="apps"> 
     
    129143          <program name="handler" type="symbolic"> 
    130144            <description> 
    131 See vshelper/action
     145See <optionref ref="vshelper-action">vshelper/action</optionref>
    132146            </description> 
    133147          </program> 
     
    232246        </boolean> 
    233247      </collection> 
     248 
     249      <collection name="build"> 
     250        <list name="options"> 
     251          <description> 
     252A list of default options to supply to vserver ... build, one option per line. 
     253          </description> 
     254        </list> 
     255      </collection> 
    234256    </collection> 
    235257 
     
    241263        </description> 
    242264      </boolean> 
     265    </collection> 
     266 
     267    <collection name="files"> 
     268      <description>This directory contains some files which will be copied to the guests during build.</description> 
     269      <data name="hosts"> 
     270        <description>The default /etc/hosts file.</description> 
     271      </data> 
     272      <data name="nsswitch.conf"> 
     273        <description>The default /etc/nsswitch.conf file.</description> 
     274      </data> 
     275      <data name="krb5.conf"> 
     276        <description>The default /etc/krb5.conf file.</description> 
     277      </data> 
     278      <data name="krb.conf"> 
     279        <description>The default /etc/krb.conf file.</description> 
     280      </data> 
     281      <data name="krb.realms"> 
     282        <description>The default /etc/krb.realms file.</description> 
     283      </data> 
     284      <data name="ldap.conf"> 
     285        <description>The default /etc/ldap.conf file.</description> 
     286      </data> 
     287      <data name="localtime"> 
     288        <description>The default /etc/localtime file.</description> 
     289      </data> 
     290      <data name="resolv.conf"> 
     291        <description>The default /etc/resolv.conf file.</description> 
     292      </data> 
    243293    </collection> 
    244294  </collection> 
     
    499549      </description> 
    500550    </list> 
    501     <scalar name="shell"> 
     551    <scalar id="shell" name="shell"> 
    502552      <description> 
    503553Contains the pathname of the shell which will be used by the "vserver 
     
    713763        </scalar> 
    714764         
    715         <scalar name="action"> 
     765        <scalar id="vshelper-action" name="action"> 
    716766          <default>restart</default> 
    717767          <description> 
     
    770820        <program name="handler" type="symbolic"> 
    771821          <description> 
    772 See vshelper/action
     822See <optionref ref="vshelper-action">vshelper/action</optionref>
    773823          </description> 
    774824        </program>