Revision 00f98619

b/man/Makefile.am
32 32
	rm -rf "$$tmpdir"
33 33

  
34 34
%.7 %.8: %.in Makefile
35
	sed -e 's#@LOCALSTATEDIR@#$(localstatedir)#g' < $< > $@
35
	sed -e 's#@LOCALSTATEDIR@#$(localstatedir)#g' \
36
	    -e 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g' \
37
	    -e 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g' \
38
	    < $< > $@
b/man/gnt-instance.sgml
70 70
          <arg>-b <replaceable>bridge</replaceable></arg>
71 71
          <arg>--mac <replaceable>MAC-address</replaceable></arg>
72 72
          <sbr>
73
          <arg>--kernel <group choice="req">
74
              <arg>default</arg>
75
              <arg><replaceable>kernel_path</replaceable></arg>
76
            </group></arg>
77
          <sbr>
78
          <arg>--initrd <group choice="req">
79
              <arg>default</arg>
80
              <arg>none</arg>
81
              <arg><replaceable>initrd_path</replaceable></arg>
82
            </group> </arg>
83
          <sbr>
73 84
          <arg choice="req">-t<group>
74 85
              <arg>diskless</arg>
75 86
              <arg>plain</arg>
......
82 93
          <arg choice="req">-n <replaceable>node<optional>:secondary-node</optional></replaceable></arg>
83 94
          <arg choice="req"><replaceable>instance</replaceable></arg>
84 95
        </cmdsynopsis>
96

  
85 97
        <para>
86 98
          Creates a new instance on the specified
87 99
          host. <replaceable>instance</replaceable> must be in DNS and
......
135 147
        </para>
136 148

  
137 149
        <para>
150
          The <option>--kernel</option> options allows the instance to
151
          use a custom kernel (if a filename is passed) or to use the
152
          default kernel (<filename>@CUSTOM_XEN_KERNEL@</filename>), if the
153
          string <constant>default</constant> is passed.
154
        </para>
155

  
156
        <para>
157
          The <option>--initrd</option> option is similar: it allows
158
          the instance to use a custom initrd (if a filename is
159
          passed) or to use the default initrd
160
          (<filename>@CUSTOM_XEN_INITRD@</filename>), if the string
161
          <constant>default</constant> is passed, or to disable the
162
          use of an initrd, if the string <constant>none</constant> is
163
          passed. Note that in the case the instance is set to use the
164
          default initrd and it doesn't exist, it will be silently
165
          ignored; if the instance is set to use a custom initrd and
166
          it doesn't exist, this will be treated as an error and will
167
          prevent the startup of the instance.
168
        </para>
169

  
170
        <para>
138 171
          The <option>-t</option> options specifies the disk layout type for
139 172
          the instance. The available choices are:
140 173
          <variablelist>
......
406 439
          <arg choice="opt">-i <replaceable>ip</replaceable></arg>
407 440
          <arg choice="opt">-b <replaceable>bridge</replaceable></arg>
408 441
          <arg choice="opt">--mac <replaceable>MAC-address</replaceable></arg>
442
          <sbr>
443
          <arg>--kernel <group choice="req">
444
              <arg>default</arg>
445
              <arg><replaceable>kernel_path</replaceable></arg>
446
            </group></arg>
447
          <sbr>
448
          <arg>--initrd <group choice="req">
449
              <arg>default</arg>
450
              <arg>none</arg>
451
              <arg><replaceable>initrd_path</replaceable></arg>
452
            </group> </arg>
453
          <sbr>
409 454
          <arg choice="req"><replaceable>instance</replaceable></arg>
410 455
        </cmdsynopsis>
411 456

  
......
421 466
        </para>
422 467

  
423 468
        <para>
469
          The <option>--kernel</option> and <option>--initrd</option>
470
          options are described in the <command>add</command> command.
471
        </para>
472

  
473
        <para>
424 474
          All the changes take effect at the next restart. If the
425 475
          instance is running, there is no effect on the instance.
426 476
        </para>

Also available in: Unified diff