October 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66597 - in /trunk/autoinstallation/doc: ENV-autoyast Makefile.am
by keichwa＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: keichwa Date: Wed Oct 26 12:57:09 2011 New Revision: 66597 URL: http://svn.opensuse.org/viewcvs/yast?rev=66597&view=rev Log: prepare building with daps and novdoc; copied from branches/tmp/ke/autoinstallation Modified: trunk/autoinstallation/doc/ENV-autoyast trunk/autoinstallation/doc/Makefile.am Modified: trunk/autoinstallation/doc/ENV-autoyast URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/ENV-autoyas… ============================================================================== --- trunk/autoinstallation/doc/ENV-autoyast (original) +++ trunk/autoinstallation/doc/ENV-autoyast Wed Oct 26 12:57:09 2011 @@ -11,8 +11,8 @@ ROOTID="" PROFOS="" PROFARCH="" -DISTVER="" -PRODUCTNAME="" +DISTVER="11 SP2" +PRODUCTNAME="&sls;" PRODUCTNAMEREG="" # if you want to be able to source this file, so you do not have Modified: trunk/autoinstallation/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/Makefile.am… ============================================================================== --- trunk/autoinstallation/doc/Makefile.am (original) +++ trunk/autoinstallation/doc/Makefile.am Wed Oct 26 12:57:09 2011 @@ -8,3 +8,14 @@ htmldir = $(docdir)/html +pdf: xml/ay_bigfile.xml + daps -e ENV-autoyast pdf-color + +html: xml/ay_bigfile.xml + daps -e ENV-autoyast html + +html-debug: xml/ay_bigfile.xml + daps --debug -e ENV-autoyast html + +xml/ay_bigfile.xml: + cd xml; make ay_bigfile.xml -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66596 - /trunk/autoinstallation/doc/xml/
by keichwa＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: keichwa Date: Wed Oct 26 12:55:58 2011 New Revision: 66596 URL: http://svn.opensuse.org/viewcvs/yast?rev=66596&view=rev Log: prepare building with daps and novdoc; copied from branches/tmp/ke/autoinstallation Added: trunk/autoinstallation/doc/xml/entity-decl.ent trunk/autoinstallation/doc/xml/network-decl.ent Modified: trunk/autoinstallation/doc/xml/ASKSection.xml trunk/autoinstallation/doc/xml/BootMedia.xml trunk/autoinstallation/doc/xml/BootloaderSection.xml trunk/autoinstallation/doc/xml/CreateProfile.xml trunk/autoinstallation/doc/xml/GeneralSection.xml trunk/autoinstallation/doc/xml/Installation.xml trunk/autoinstallation/doc/xml/KDumpSection.xml trunk/autoinstallation/doc/xml/Makefile.am trunk/autoinstallation/doc/xml/NetworkSection.xml trunk/autoinstallation/doc/xml/PartitioningSection.xml trunk/autoinstallation/doc/xml/Profile.xml trunk/autoinstallation/doc/xml/RulesAndClasses.xml trunk/autoinstallation/doc/xml/ScriptsSection.xml trunk/autoinstallation/doc/xml/SoftwareSection.xml trunk/autoinstallation/doc/xml/autoyast.xml trunk/autoinstallation/doc/xml/linuxrc.xml Modified: trunk/autoinstallation/doc/xml/ASKSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/ASKSect… ============================================================================== --- trunk/autoinstallation/doc/xml/ASKSection.xml (original) +++ trunk/autoinstallation/doc/xml/ASKSection.xml Wed Oct 26 12:55:58 2011 @@ -35,7 +35,7 @@ <para> The following elements must be between the <ask-list config:type="list"><ask> ... </ask></ask-list> tags in the <general> section. </para> - <para> + <table frame='top'> <title>XML representation</title> <tgroup cols="3"> @@ -49,95 +49,95 @@ <tbody> <row> <entry>question</entry> - <entry>The question you want to ask the user. - <para><screen><question>Enter the LDAP server</question></screen></para></entry> + <entry><para>The question you want to ask the user.</para> + <screen><question>Enter the LDAP server</question></screen></entry> <entry>The default value is the path to the element (the path often looks strange, so I recommend to enter a question)</entry> </row> <row> <entry>default</entry> - <entry>you can set a pre-selection for the user. A textentry will be filled out with this value, + <entry><para>you can set a pre-selection for the user. A textentry will be filled out with this value, a checkbox will be "true" or "false" and a selection will have this default "value" pre-selected. - <para><screen><default>dc=suse,dc=de</default></screen></para></entry> + </para><screen><default>dc=suse,dc=de</default></screen></entry> <entry>optional</entry> </row> <row> <entry>help</entry> - <entry>An optional helptext that is shown on the left side of the question. - <para><screen><help>Enter the LDAP server address.</help></screen></para></entry> + <entry><para>An optional helptext that is shown on the left side of the question. + </para><screen><help>Enter the LDAP server address.</help></screen></entry> <entry>optional</entry> </row> <row> <entry>title</entry> - <entry>An optional title that is shown above the questions. - <para><screen><title>LDAP server</title></screen></para></entry> + <entry><para>An optional title that is shown above the questions. + </para><screen><title>LDAP server</title></screen></entry> <entry>optional</entry> </row> <row> <entry>type</entry> - <entry>the type of the element you want to change. Possible values are "symbol","boolean","string" and "integer". + <entry><para>the type of the element you want to change. Possible values are "symbol","boolean","string" and "integer". The filesystem in the partition section is a symbol, while the "encrypted" element in the user configuration is a boolean. You can see the type of that element if you look in your profile at the config:type="...." attribute. Since openSUSE 11.2 and SLES11-SP2 you can use "static_text" as type too. A static_text is just a text that does not require any user input and can be used to show information if it's not wanted in the help text. - <para><screen><type>symbol</type></screen></para></entry> + </para><screen><type>symbol</type></screen></entry> <entry>optional. The defaul is string. If type is "symbol" you must provide the selection element too (see below)</entry> </row> <row> <entry>password</entry> - <entry>if this boolean is set to "true", a password dialog pops up instead of a simple text entry. Setting this + <entry><para>if this boolean is set to "true", a password dialog pops up instead of a simple text entry. Setting this to "true" makes only sense if "type" is string. - <para><screen><password config:type="boolean">true</password></screen></para></entry> + </para><screen><password config:type="boolean">true</password></screen></entry> <entry>optional. The default is "false"</entry> </row> <row> <entry>path (deprecated since openSUSE 11.0 - use pathlist)</entry> - <entry>The path to the element in the profile. It's a comma seperated list of elements that describes the + <entry><para>The path to the element in the profile. It's a comma seperated list of elements that describes the path to the element you want to change. For example, the ldap server element can be found in the profile in the <ldap><ldap_server> section. So if you want to change that value, you have to set the path to "ldap,ldap_server". If you want to change the password of the first user in the profile, you have to set the path to "users,0,user_password". The "0" indicates the first user in the <users config:type="list"> list of users in the profile. - <para><screen><path>networking,dns,hostname</path></screen></para></entry> + </para><screen><path>networking,dns,hostname</path></screen></entry> <entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry> </row> <row> - <entry>pathlist (available since openSUSE 11.0 and replaces <emphasis>path</emphasis>)</entry> - <entry>a list of <emphasis>path</emphasis> elements (see above) - <para><screen><pathlist config:type="list"><path>networking,dns,hostname</path><path>...</path></screen></para></entry> - <entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry> + <entry><para>pathlist (available since openSUSE 11.0 and replaces <emphasis>path</emphasis>)</para></entry> + <entry><para>a list of <emphasis>path</emphasis> elements (see above) + </para><screen><pathlist config:type="list"><path>networking,dns,hostname</path><path>...</path></screen></entry> + <entry><para>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></para></entry> </row> <row> <entry>file (available since SLES10 SP1 and SL 10.2)</entry> - <entry>you can store the answer to a question in a file, to use it in one of your scripts later. If you ask during stage=inital and you want to use the answer in stage2, then you have to copy the answer-file in a chroot script that is running as chrooted=false. Do it like this "cp /tmp/my_answer /mnt/tmp/". The reason for that is, that /tmp in stage1 is just in the RAM disk and will get lost after the reboot but the installed system is already mounted at /mnt/ - <para><screen><file>/tmp/answer_hostname</file></screen></para></entry> - <entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry> + <entry><para>you can store the answer to a question in a file, to use it in one of your scripts later. If you ask during stage=inital and you want to use the answer in stage2, then you have to copy the answer-file in a chroot script that is running as chrooted=false. Do it like this "cp /tmp/my_answer /mnt/tmp/". The reason for that is, that /tmp in stage1 is just in the RAM disk and will get lost after the reboot but the installed system is already mounted at /mnt/ + </para><screen><file>/tmp/answer_hostname</file></screen></entry> + <entry><para>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></para></entry> </row> <row> <entry>password</entry> - <entry>if this boolean is set to "true", a password dialog pops up instead of a simple text entry. Setting this + <entry><para>if this boolean is set to "true", a password dialog pops up instead of a simple text entry. Setting this to "true" makes only sense if "type" is string. - <para><screen><password config:type="boolean">true</password></screen></para></entry> + </para><screen><password config:type="boolean">true</password></screen></entry> <entry>optional. The default is "false"</entry> </row> <row> <entry>stage</entry> - <entry>stage configures the installation stage where the question pops up. You can set this value to "cont" or + <entry><para>stage configures the installation stage where the question pops up. You can set this value to "cont" or "initial". "initial" means the popup comes up very early in the installation, short after the pre-script has run. "cont" means, that the dialog with the question comes after the first reboot, when the system boots for the very first time. Questions you answer during the "inital" stage, will write their answer into the profile on the harddisk. You should know that if you enter cleartext passwords during "initial". Of course it does not make sense to ask for a filesystem to use in the "cont" phase. The harddisk is already partitioned at that stage and the question will have no effect. - <para><screen><stage>cont</stage></screen></para></entry> + </para><screen><stage>cont</stage></screen></entry> <entry>optional. The default is "initial"</entry> </row> <row> <entry>selection</entry> - <entry>the selection element contains a list of <entry> elements. Each entry represents a possible option + <entry><para>the selection element contains a list of <entry> elements. Each entry represents a possible option for the user to choose. So the user can't enter a value in a textfield, but he can choose from a list of values. - <para><screen> + </para><screen> <selection config:type="list"> <entry> <value> @@ -155,71 +155,69 @@ Extended3 Filesystem </label> </entry> -</selection></screen></para></entry> +</selection></screen></entry> <entry>optional for type=string, not possible for type=boolean and a must have for type=symbol</entry> </row> <row> <entry>dialog (available since SL 10.3 and SLES10 SP2)</entry> - <entry>Since OpenSUSE 10.3 you can have more than one question per dialog. To make that possible you have + <entry><para>Since OpenSUSE 10.3 you can have more than one question per dialog. To make that possible you have to specifiy the dialog-id with an integer. All questions with the same dialog-id are on the same dialog. The dialogs are sorted by the id too. - <para><screen><dialog config:type="integer">3</dialog></screen></para></entry> + </para><screen><dialog config:type="integer">3</dialog></screen></entry> <entry>optional</entry> </row> <row> <entry>element (available since SL 10.3 and SLES10 SP2)</entry> - <entry>Since OpenSUSE 10.3 you can have more than one question per dialog. To make that possible you have + <entry><para>Since OpenSUSE 10.3 you can have more than one question per dialog. To make that possible you have to specifiy the element-id with an integer. The questions on a dialog are sorted by the id. - <para><screen><element config:type="integer">1</element></screen></para></entry> + </para><screen><element config:type="integer">1</element></screen></entry> <entry>optional (see dialog></entry> </row> <row> <entry>frametitle (available since SL 10.3 and SLES10 SP2)</entry> - <entry>Since OpenSUSE 10.3 you can have more than one question per dialog. Each question on a dialog has + <entry><para>Since OpenSUSE 10.3 you can have more than one question per dialog. Each question on a dialog has a frame that can have a frametitle. A small caption for each question if you want so. Since openSUSE 11.3 you can put multiple elements into one frame. They have to have the same frametitle then. - <para><screen><frametitle>User data</frametitle></screen></para></entry> + </para><screen><frametitle>User data</frametitle></screen></entry> <entry>optional (default is no frametitle)</entry> </row> <row> <entry>script (available since SL 10.3 not in SLES10 SP1)</entry> - <entry>with 10.3 you can run scripts after a question has been answered (see the table below for detailed instructions about scripts) - <para><screen><script>...</script></screen></para></entry> + <entry><para>with 10.3 you can run scripts after a question has been answered (see the table below for detailed instructions about scripts) + </para><screen><script>...</script></screen></entry> <entry>optional (default is no script)</entry> </row> <row> <entry>ok_label (available since openSUSE 11.2 / SLES11 SP2</entry> - <entry>You can change the Label on the "Ok" button. The last element that specifies the label for a dialog wins. - <para><screen><ok_label>Finish</ok_label></screen></para></entry> + <entry><para>You can change the Label on the "Ok" button. The last element that specifies the label for a dialog wins. + </para><screen><ok_label>Finish</ok_label></screen></entry> <entry>optional</entry> </row> <row> <entry>back_label (available since openSUSE 11.2 / SLES11 SP2</entry> - <entry>You can change the Label on the "Back" button. The last element that specifies the label for a dialog wins. - <para><screen><back_label>change values</back_label></screen></para></entry> + <entry><para>You can change the Label on the "Back" button. The last element that specifies the label for a dialog wins. + </para><screen><back_label>change values</back_label></screen></entry> <entry>optional</entry> </row> <row> <entry>timeout (available since openSUSE 11.2 / SLES11-SP2</entry> - <entry>You can specify an integer here that is used as timeout in seconds. If the user does not answer the question before the timeout, the default value is taken as answer. When the user touches/changes any widget in the dialog, the timeout is turned off and the dialog has to be confirmed by the ok-button. - <para><screen><timeout config:type="integer">30</timeout></screen></para></entry> + <entry><para>You can specify an integer here that is used as timeout in seconds. If the user does not answer the question before the timeout, the default value is taken as answer. When the user touches/changes any widget in the dialog, the timeout is turned off and the dialog has to be confirmed by the ok-button. + </para><screen><timeout config:type="integer">30</timeout></screen></entry> <entry>optional. A missing value is interpreted as 0 which means that there is no timeout</entry> </row> <row> <entry>default_value_script (available since openSUSE 11.2 / SLES11-SP2)</entry> - <entry>you can run scripts to set the default value for a question(see the table below for detailed instructions about default value scripts). It's useful if you can "calculate" a useful default value, especially in combination with the "timeout" option. - <para><screen><default_value_script>...</default_value_script></screen></para></entry> + <entry><para>you can run scripts to set the default value for a question(see the table below for detailed instructions about default value scripts). It's useful if you can "calculate" a useful default value, especially in combination with the "timeout" option. + </para><screen><default_value_script>...</default_value_script></screen></entry> <entry>optional (default is no script)</entry> </row> </tbody> </tgroup> </table> - </para> <para> The following elements must be between the <ask-list config:type="list"><ask><default_value_script>...</default_value_script>...</ask></ask-list> tags in the <general> section. It's available since 11.2 and SLES11-SP2 </para> - <para> <table frame='top'> <title>XML representation</title> <tgroup cols="3"> @@ -233,26 +231,24 @@ <tbody> <row> <entry>source</entry> - <entry>the source code of the script. Whatever you echo to STDOUT will be used as default value for the ask-dialog. If your script has an exit code other than 0, the normal default element is used. Take care you echo with "echo -n" to suppress the '\n' and that you echo reasonable values and not "okay" for a boolean - <para><screen><source>...</source></screen></para></entry> + <entry><para>the source code of the script. Whatever you echo to STDOUT will be used as default value for the ask-dialog. If your script has an exit code other than 0, the normal default element is used. Take care you echo with "echo -n" to suppress the '\n' and that you echo reasonable values and not "okay" for a boolean + </para><screen><source>...</source></screen></entry> <entry>this value is required. Otherwise nothing would be executed</entry> </row> <row> <entry>interpreter</entry> - <entry>the interpreter to use - <para><screen><interpreter>perl</interpreter></screen></para></entry> + <entry><para>the interpreter to use + </para><screen><interpreter>perl</interpreter></screen></entry> <entry>default is shell (you can set "/bin/myinterpreter" as value too)</entry> </row> </tbody> </tgroup> </table> - </para> <para> The following elements must be between the <ask-list config:type="list"><ask><script>...</script>...</ask></ask-list> tags in the <general> section. It's available since 10.3 (not SLES10 SP1). </para> - <para> <table frame='top'> <title>XML representation</title> <tgroup cols="3"> @@ -266,44 +262,43 @@ <tbody> <row> <entry>filename</entry> - <entry>the filename of the script - <para><screen><filename>my_ask_script.sh</filename></screen></para></entry> + <entry><para>the filename of the script + </para><screen><filename>my_ask_script.sh</filename></screen></entry> <entry>default is ask_script.sh</entry> </row> <row> <entry>source</entry> - <entry>the source code of the script. Together with "rerun_on_error" on you check the value that was entered for sanity (since 11.0 only). Your script can create a file "/tmp/next_dialog" with a dialog id in it. That's the next dialog autoyast will raise then. A value of -1 terminates the ask sequence. If that file is not created, autoyast will run the dialogs in a normal order (since 11.0 only) - <para><screen><source>...</source></screen></para></entry> + <entry><para>the source code of the script. Together with "rerun_on_error" on you check the value that was entered for sanity (since 11.0 only). Your script can create a file "/tmp/next_dialog" with a dialog id in it. That's the next dialog autoyast will raise then. A value of -1 terminates the ask sequence. If that file is not created, autoyast will run the dialogs in a normal order (since 11.0 only) + </para><screen><source>...</source></screen></entry> <entry>this value is required. Otherwise nothing would be executed</entry> </row> <row> <entry>environment</entry> - <entry>a boolean that passes the "value" of the answer to the question as an environment variable to the script. The variable is named "VAL". - <para><screen><environment config:type="boolean">true</environment></screen></para></entry> + <entry><para>a boolean that passes the "value" of the answer to the question as an environment variable to the script. The variable is named "VAL". + </para><screen><environment config:type="boolean">true</environment></screen></entry> <entry>optional (default is "false").</entry> </row> <row> <entry>feedback</entry> - <entry>a boolean that turns on feedback for the script execution. That means that STDOUT will be shown in a popup box that must be confirmed after the script execution. - <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry> + <entry><para>a boolean that turns on feedback for the script execution. That means that STDOUT will be shown in a popup box that must be confirmed after the script execution. + </para><screen><feedback config:type="boolean">true</feedback></screen></entry> <entry>optional (default is "false").</entry> </row> <row> <entry>debug</entry> - <entry>a boolean that turns on debugging for the script execution - <para><screen><debug config:type="boolean">true</debug></screen></para></entry> + <entry><para>a boolean that turns on debugging for the script execution + </para><screen><debug config:type="boolean">true</debug></screen></entry> <entry>optional (default is "true"). This value needs feedback to be turned on too.</entry> </row> <row> <entry>rerun_on_error (available since openSUSE 11.0)</entry> - <entry>a boolean that keeps the dialog open until the script has an exit code of 0 (zero). So you can parse and check the answers the user gave in the script and popup an error with the "feedback" option. - <para><screen><rerun_on_error config:type="boolean">true</rerun_on_error></screen></para></entry> + <entry><para>a boolean that keeps the dialog open until the script has an exit code of 0 (zero). So you can parse and check the answers the user gave in the script and popup an error with the "feedback" option. + </para><screen><rerun_on_error config:type="boolean">true</rerun_on_error></screen></entry> <entry>optional (default is "false"). This value should be used together with the feedback option.</entry> </row> </tbody> </tgroup> </table> - </para> <para> Below you can see an example of the usage of the "ask" feature. </para> @@ -414,7 +409,7 @@ <para> Since openSUSE 11.0 you can verify the answer of a question with a script like this: </para> -<para> + <screen> <ask> <script> @@ -444,9 +439,6 @@ <default>enter your hostname here</default> </ask> </screen> -</para> - - </section> Modified: trunk/autoinstallation/doc/xml/BootMedia.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/BootMed… ============================================================================== --- trunk/autoinstallation/doc/xml/BootMedia.xml (original) +++ trunk/autoinstallation/doc/xml/BootMedia.xml Wed Oct 26 12:55:58 2011 @@ -21,8 +21,8 @@ Floppies can be used to store the control file, especially when using the original &company-suse; CD-ROMs for a single, disconnected machine. Using the kernel command line, you can specify the location of the control - file on the floppy. (See <quote><link linkend='BootFromFloppy' - endterm="BootFromFloppy.title"></link></quote>) + file on the floppy. (See <quote><xref linkend='BootFromFloppy' + endterm="BootFromFloppy.title"></xref></quote>) </para> <para> Even without specifying any command line options, it is still possible to initiate the @@ -54,4 +54,4 @@ mode: xml sgml-parent-document: ("autoyast2.xml" "chapter" "section") End: - --> \ No newline at end of file + --> Modified: trunk/autoinstallation/doc/xml/BootloaderSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Bootloa… ============================================================================== --- trunk/autoinstallation/doc/xml/BootloaderSection.xml (original) +++ trunk/autoinstallation/doc/xml/BootloaderSection.xml Wed Oct 26 12:55:58 2011 @@ -22,6 +22,7 @@ <para>This documentation is for yast2-bootloader and is is valid for SLE11 and openSUSE 11.0+. For older versions please use the documentation that comes with your distribution in /usr/share/doc/packages/autoyast2/</para> <para> General scope of autoyast profile only bootloader part. + </para> <screen> <bootloader> <device_map config:type="list"> @@ -39,7 +40,7 @@ </sections> </bootloader> </screen> -</para> + <section><title>Device map</title> <para> You can define devices and their order in device.map but it is not necessary. yast2-bootloader checks the devices during the installation and proposes a device.map by itself. It can happen that the order of the devices is wrong or you have defined a different order than it is in the BIOS (please take care about changes there. it can leads to unbootable system). @@ -56,6 +57,7 @@ <section><title>Globals</title> <para> This is an important part where you can define where to install GRUB and also how the boot process will work. It is not necessary to define this part as mentioned before, yast2-bootloader proposes a configuration by itself and so this is optional. Usually the AutoYaST profile includes only this part and all other parts are added automatically during installation by yast2-bootloader. Unless you have some special needs, you don't have to specify the bootloader config in the XML file. + </para> <screen> <global> <activate>true</activate> @@ -65,7 +67,6 @@ <timeout config:type="integer">10</timeout> </global> </screen> - </para> <informaltable frame='top'> <tgroup cols="3"> @@ -82,7 +83,7 @@ <entry> <para>set boot flag on boot partition. The boot partition can be "/" if there is no separate /boot partition. If the boot partition is on logical partition, the boot flag is set to the extended partition. </para> - <para><screen><activate>true</activate></screen></para> + <para><literal><activate>true</activate></literal></para> </entry> <entry></entry> </row> @@ -92,7 +93,7 @@ <para> name(title) of the default boot section from menu.lst </para> - <para><screen><default>openSUSE 11.2 - 2.6.31.5-0.1</default></screen></para> + <para><literal><default>openSUSE 11.2 - 2.6.31.5-0.1</default></literal></para> </entry> <entry></entry> </row> @@ -102,7 +103,7 @@ <para> path to the graphical boot menu (/boot/message). 'none' means don't use graphical boot menu </para> - <para><screen><gfxmenu>(hd0,1)/boot/message</gfxmenu></screen></para> + <para><literal><gfxmenu>(hd0,1)/boot/message</gfxmenu></literal></para> </entry> <entry></entry> </row> @@ -112,7 +113,7 @@ <para> timeout in seconds for automatic booting the default boot section from menu.lst </para> - <para><screen><timeout config:type="integer">10</timeout></screen></para> + <para><literal><timeout config:type="integer">10</timeout></literal></para> </entry> <entry></entry> </row> @@ -122,7 +123,7 @@ <para> write generic boot code to MBR. (It is ignored if boot_mbr is set to true) </para> - <para><screen><generic_mbr>false</generic_mbr></screen></para> + <para><literal><generic_mbr>false</generic_mbr></literal></para> </entry> <entry></entry> </row> @@ -132,7 +133,7 @@ <para> write GRUB to MBR of the first disk in the order (device.map include order of disks) </para> - <para><screen><boot_mbr>false</boot_mbr></screen></para> + <para><literal><boot_mbr>false</boot_mbr></literal></para> </entry> <entry></entry> </row> @@ -142,7 +143,7 @@ <para> write GRUB to separate /boot partition (if separate /boot partition missing GRUB will be written to "/") </para> - <para><screen><boot_boot>false</boot_boot></screen></para> + <para><literal><boot_boot>false</boot_boot></literal></para> </entry> <entry></entry> </row> @@ -152,7 +153,7 @@ <para> write GRUB to "/" partition </para> - <para><screen><boot_root>false</boot_root></screen></para> + <para><literal><boot_root>false</boot_root></literal></para> </entry> <entry></entry> </row> @@ -162,7 +163,7 @@ <para> write GRUB to the extended partition (it is important if you want to use a generic boot code and the "boot" partition is logical) NOTE: if the boot partition is logical it should use boot_mbr (write GRUB to MBR) instead of generic_mbr. </para> - <para><screen><boot_extended>false</boot_extended></screen></para> + <para><literal><boot_extended>false</boot_extended></literal></para> </entry> <entry></entry> </row> @@ -172,7 +173,7 @@ <para> write GRUB to custom device. </para> - <para><screen><boot_custom>/dev/sda3</boot_custom></screen></para> + <para><literal><boot_custom>/dev/sda3</boot_custom></literal></para> </entry> <entry></entry> </row> @@ -182,7 +183,7 @@ <para> use trusted GRUB instead of the classical GRUB (gfxmenu is deleted automatically if this option is true) please doesn't use trusted GRUB if your hardware doesn't support it. </para> - <para><screen><trusted_grub>false</trusted_grub></screen></para> + <para><literal><trusted_grub>false</trusted_grub></literal></para> </entry> <entry></entry> </row> @@ -192,7 +193,7 @@ <para> internal option which means cache id for perl-Bootloader. Please don't use it or change it in a cloned XML file. </para> - <para><screen></screen></para> + <para><literal></literal></para> </entry> <entry></entry> </row> @@ -279,7 +280,7 @@ <para> list of kernel args but without(!) vga= and root= </para> - <para><screen><append>splash=silent quiet showopts</append></screen></para> + <para><literal><append>splash=silent quiet showopts</append></literal></para> </entry> <entry></entry> </row> @@ -289,7 +290,7 @@ <para> path to the kernel </para> - <para><screen><image>(hd0,0)/vmlinuz-2.6.31-10</image></screen></para> + <para><literal><image>(hd0,0)/vmlinuz-2.6.31-10</image></literal></para> </entry> <entry></entry> </row> @@ -299,7 +300,7 @@ <para> path to the initrd </para> - <para><screen><initrd>(hd0,0)/my-initrd</initrd></screen></para> + <para><literal><initrd>(hd0,0)/my-initrd</initrd></literal></para> </entry> <entry></entry> </row> @@ -309,7 +310,7 @@ <para> internal option which means cache id for perl-Bootloader. Please don't use it or change it in a cloned XML file. </para> - <para><screen></screen></para> + <para><literal></literal></para> </entry> <entry></entry> </row> @@ -319,7 +320,7 @@ <para> name of section </para> - <para><screen><name>Productive System</name></screen></para> + <para><literal><name>Productive System</name></literal></para> </entry> <entry></entry> </row> @@ -329,7 +330,7 @@ <para> internal name of section parsed by YaST from a comment in the config file. There are some rules for names and original_name helps to determine if boot section is linux or failsafe and for chainloader it helps to determine if it is windows or other linux/floppy etc. Please use simple original_name: linux, xen, windows, floppy etc. </para> - <para><screen><original_name>linux</original_name></screen></para> + <para><literal><original_name>linux</original_name></literal></para> </entry> <entry></entry> </row> @@ -339,7 +340,7 @@ <para> location of the root partition ("/") </para> - <para><screen><root>/dev/mapper/sil_ajacccbhejai_part3</root></screen></para> + <para><literal><root>/dev/mapper/sil_ajacccbhejai_part3</root></literal></para> </entry> <entry></entry> </row> @@ -349,7 +350,7 @@ <para> type of section it could (image/xen/other/menu) </para> - <para><screen><type>xen</type></screen></para> + <para><literal><type>xen</type></literal></para> </entry> <entry></entry> </row> @@ -359,7 +360,7 @@ <para> kernel arg for vga (vga=) </para> - <para><screen><vgamode>0x31a</vgamode></screen></para> + <para><literal><vgamode>0x31a</vgamode></literal></para> </entry> <entry></entry> </row> @@ -369,7 +370,7 @@ <para> path to xen.gz </para> - <para><screen><xen>(hd0,0)/xen.gz</xen></screen></para> + <para><literal><xen>(hd0,0)/xen.gz</xen></literal></para> </entry> <entry></entry> </row> @@ -379,7 +380,7 @@ <para> kernel args for XEN </para> - <para><screen><xen_append></xen_append></screen></para> + <para><literal><xen_append></xen_append></literal></para> </entry> <entry></entry> </row> @@ -404,7 +405,7 @@ <para> internal option which means cache id for perl-Bootloader. Please don't use it or change it in a cloned XML file. </para> - <para><screen></screen></para> + <para><literal></literal></para> </entry> <entry></entry> </row> @@ -414,7 +415,7 @@ <para> name or title of section </para> - <para><screen><name>Floppy</name></screen></para> + <para><literal><name>Floppy</name></literal></para> </entry> <entry></entry> </row> @@ -424,7 +425,7 @@ <para> internal name of section parsed by YaST from a comment in the config file. There are some rules for names and original_name helps to determine if boot section is linux or failsafe and for chainloader it helps to determine if it is windows or other linux/floppy etc. Please use simple original_name: linux, xen, windows, floppy etc. </para> - <para><screen><original_name>linux</original_name></screen></para> + <para><literal><original_name>linux</original_name></literal></para> </entry> <entry></entry> </row> @@ -434,7 +435,7 @@ <para> type of section it could (image/xen/other/menu) </para> - <para><screen><type>other</type></screen></para> + <para><literal><type>other</type></literal></para> </entry> <entry></entry> </row> @@ -444,7 +445,7 @@ <para> offset in chainloader (used only in grub) </para> - <para><screen><blockoffset>1</blockoffset></screen></para> + <para><literal><blockoffset>1</blockoffset></literal></para> </entry> <entry></entry> </row> @@ -454,7 +455,7 @@ <para> partition part for chainloader (so chainloader+blockoffset get final chainloader item in grub) </para> - <para><screen><chainloader>/dev/fd0</chainloader></screen></para> + <para><literal><chainloader>/dev/fd0</chainloader></literal></para> </entry> <entry></entry> </row> @@ -464,7 +465,7 @@ <para> with/without checking root </para> - <para><screen><noverifyroot>true</noverifyroot></screen></para> + <para><literal><noverifyroot>true</noverifyroot></literal></para> </entry> <entry></entry> </row> @@ -474,7 +475,7 @@ <para> it is special for windows and it means remapping disk which makes the second disk the first e.g. map (hd0) (hd1) map (hd1) (hd0) </para> - <para><screen><remap>false</remap></screen></para> + <para><literal><remap>false</remap></literal></para> </entry> <entry></entry> </row> @@ -484,7 +485,7 @@ <para> add the makeactive argument for chainloader section </para> - <para><screen><makeactive>false</makeactive></screen></para> + <para><literal><makeactive>false</makeactive></literal></para> </entry> <entry></entry> </row> @@ -509,7 +510,7 @@ <para> internal option which means cache id for perl-Bootloader. Please don't use it or change it in a cloned XML file. </para> - <para><screen></screen></para> + <para><literal></literal></para> </entry> <entry></entry> </row> @@ -519,7 +520,7 @@ <para> name or title of section </para> - <para><screen><name>Floppy</name></screen></para> + <para><literal><name>Floppy</name></literal></para> </entry> <entry></entry> </row> @@ -529,7 +530,7 @@ <para> internal name of section parsed by YaST from a comment in the config file. There are some rules for names and original_name helps to determine if boot section is linux or failsafe and for chainloader it helps to determine if it is windows or other linux/floppy etc. Please use simple original_name: linux, xen, windows, floppy etc. </para> - <para><screen><original_name>linux</original_name></screen></para> + <para><literal><original_name>linux</original_name></literal></para> </entry> <entry></entry> </row> @@ -539,7 +540,7 @@ <para> type of section it could (image/xen/other/menu) </para> - <para><screen><type>other</type></screen></para> + <para><literal><type>other</type></literal></para> </entry> <entry></entry> </row> @@ -549,7 +550,7 @@ <para> path to menu.lst config file </para> - <para><screen><configfile>1</configfile></screen></para> + <para><literal><configfile>1</configfile></literal></para> </entry> <entry></entry> </row> @@ -559,7 +560,7 @@ <para> device name for loading menu.lst from other installation of linux </para> - <para><screen><root>/dev/sda1</root></screen></para> + <para><literal><root>/dev/sda1</root></literal></para> </entry> <entry></entry> </row> Modified: trunk/autoinstallation/doc/xml/CreateProfile.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/CreateP… ============================================================================== --- trunk/autoinstallation/doc/xml/CreateProfile.xml (original) +++ trunk/autoinstallation/doc/xml/CreateProfile.xml Wed Oct 26 12:55:58 2011 @@ -1,7 +1,8 @@ <chapter id="CreateProfile"> <title >Creating A Control File</title> - + <para> + </para> <section id="Autoinstallation.collectInfo"> <title>Collect information</title> <para> @@ -133,24 +134,28 @@ </example> <para> As you can see, this file expects the "hostname" and the "domain" as parameters from the user. + </para> <screen><xsl:param name="hostname"/> <xsl:param name="domain"/></screen> - There will be a "copy" of those parameters in the "dns" section of the control file. That means, - if there already is a domain element in the dns section, you'll get a second one (no good). - </para> + <para>There will be a "copy" of those parameters in the "dns" section of the control file. That means, + if there already is a domain element in the dns section, you'll get a second one (no good).</para> <para> If you want to create a new autoyast profile now from the template plus the XSL file, run the following command: + </para> <screen>sabcmd add_hostname.xsl \$hostname=myHost \$domain=my.domain template.xml</screen> + <para> You'll get a filled out autoyast profile then on STDOUT. </para> <para> - If you have multiple XSL files you want to apply to a template, do it like this + If you have multiple XSL files you want to apply to a template, do it like this: + </para> <screen> sabcmd add_hd_vg.xsl \$device=/dev/sda \$partition=p2 \$vg=system \ | sabcmd add_harddisk.xsl \$device=/dev/system \$lvm=true \ | sabcmd .... | sabcmd add_hostname.xsl \$hostname=myHost \$domain=my.domain </screen> + <para> So you just pipe the output of each sabcmd to the next sabcmd. </para> <para> Modified: trunk/autoinstallation/doc/xml/GeneralSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/General… ============================================================================== --- trunk/autoinstallation/doc/xml/GeneralSection.xml (original) +++ trunk/autoinstallation/doc/xml/GeneralSection.xml Wed Oct 26 12:55:58 2011 @@ -59,7 +59,7 @@ reason. true will reboot, false will not reboot and a missing <emphasis>forceboot</emphasis> option uses the products default. </para> - + <screen><xi:include href="examples/example.generalOptions.xml" parse="text" @@ -130,6 +130,7 @@ </para> <para> This is the list of proposals for openSUSE 11.1 are (you can find that in the control.xml on the installation source too): + </para> <itemizedlist> <listitem> <para> @@ -182,7 +183,6 @@ </para> </listitem> </itemizedlist> - </para> <para> The wait section was invented with openSUSE 11.1 and SLES11. You can let AutoYaST sleep before and after each module during the second stage. You can run scripts and/or you can pass a value (in seconds) for AutoYaST to sleep. In the example above AutoYaST will sleep for 15 seconds (10+5) before Modified: trunk/autoinstallation/doc/xml/Installation.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Install… ============================================================================== --- trunk/autoinstallation/doc/xml/Installation.xml (original) +++ trunk/autoinstallation/doc/xml/Installation.xml Wed Oct 26 12:55:58 2011 @@ -1,6 +1,8 @@ <chapter id="Invoking"> <title>The Auto-Installation Process</title> + <para> + </para> <section id="Installation.process"> <title> @@ -122,6 +124,7 @@ </para> <para> Here is a small example of a "/srv/tftp/pxelinux.cfg/default" file: + </para> <screen> default SLES9 @@ -134,7 +137,6 @@ label hdÂ· LOCALBOOT 0 </screen> - </para> <para> It's recommended to add the vga=... parameter with a valid value for graphical installations, to trigger an installation with the frame buffer device instead @@ -142,6 +144,7 @@ </para> <para> Here is as a small example my "/etc/dhcp.conf" file: + </para> <screen> option domain-name-servers 192.168.66.1; default-lease-time 600; @@ -169,7 +172,6 @@ filename "pxelinux.0"; } </screen> - </para> <para> A problem you might run into if you do installation via PXE is, that the installation will run into an endless loop, because after the first reboot, @@ -186,6 +188,7 @@ <para> Another way is to use autoyast to upload a new PXE boot configuration for that host. That is done via autoyast profile like this: + </para> <screen> <![CDATA[ <pxe> @@ -203,7 +206,8 @@ </pxe> ]]> </screen> - This will upload a new configuration for the actual machine to the tftp server short + <para> + This will upload a new configuration for the actual machine to the tftp server short before the first reboot happens. In most installations the TFTP daemon runs as user "nobody". You have to make sure that that user has write permissions to the "pxelinux.cfg" directory if you use that mechanism. @@ -251,8 +255,8 @@ <para> The configuration file used by <command>linuxrc</command> can have the following keywords (for a detailed description of how linuxrc works and - other keywords, see <quote><link linkend='appendix.linuxrc' - endterm="appendix.linuxrc.title"></link></quote> ): + other keywords, see <quote><xref linkend='appendix.linuxrc' + endterm="appendix.linuxrc.title"></xref></quote> ): </para> <table frame='top'> @@ -331,8 +335,8 @@ </para> <para> The format of the special command line variable - <emphasis>autoyast</emphasis> can be used as described in table <quote><link - linkend="commandLineAutoYaST" endterm="commandLineAutoYaST.title"></link></quote> + <emphasis>autoyast</emphasis> can be used as described in table <quote><xref + linkend="commandLineAutoYaST" endterm="commandLineAutoYaST.title"></xref></quote> </para> <table frame='top' id="commandLineAutoYaST"> @@ -439,9 +443,9 @@ upon startup for a file named <filename>autoinst.xml</filename>. If such a file is found, YaST2 will switch into auto-installation mode even if no special - command line variables were supplied. (See <quote><link + command line variables were supplied. (See <quote><xref linkend="autoinstall.singlesystem" - endterm="autoinstall.singlesystem.title"></link></quote> ) + endterm="autoinstall.singlesystem.title"></xref></quote> ) </para> </listitem> <listitem> @@ -550,10 +554,10 @@ <listitem> <para> Specify the exact location of the control file: + </para> <screen> autoyast=http://192.168.1.1/control-files/client01.xml </screen> - </para> </listitem> <listitem> <para> Modified: trunk/autoinstallation/doc/xml/KDumpSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/KDumpSe… ============================================================================== --- trunk/autoinstallation/doc/xml/KDumpSection.xml (original) +++ trunk/autoinstallation/doc/xml/KDumpSection.xml Wed Oct 26 12:55:58 2011 @@ -96,7 +96,6 @@ For the <emphasis>amount</emphasis> of memory, following values are recommended: </para> - <para> <table frame="top"> <title>Recommended values for the reserved memory amount</title> <tgroup cols="2"> @@ -139,7 +138,6 @@ </tbody> </tgroup> </table> - </para> <para> To make things even more complicated, there's a so-called <emphasis>extended @@ -149,9 +147,7 @@ on one machine. The syntax is: </para> - <para> <screen>BEGIN_RANGE_1-END_RANGE_1:AMOUNT_1,BEGIN_RANGE_2-END_RANGE_2:AMOUNT_2@OFFSET</screen> - </para> <para> In that syntax <literal>BEGIN_RANGE_1</literal> is the start of the first @@ -168,7 +164,6 @@ memory reservation: </para> - <para> <table frame='top'> <title>XML representation of the memory reservation settings</title> <tgroup cols="3"> @@ -182,20 +177,19 @@ <tbody> <row> <entry>add_crash_kernel</entry> - <entry>If the memory should be reserved, that basically enables or disables kdump. - <para><screen><add_crash_kernel config:type="boolean">true</add_crash_kernel></screen></para></entry> + <entry><para>If the memory should be reserved, that basically enables or disables kdump. + </para><screen><add_crash_kernel config:type="boolean">true</add_crash_kernel></screen></entry> <entry>required</entry> </row> <row> <entry>crash_kernel</entry> - <entry>The syntax of the crashkernel command line as discussed above. - <para><screen><crash_kernel>256M:64M</crash_kernel></screen></para></entry> + <entry><para>The syntax of the crashkernel command line as discussed above. + </para><screen><crash_kernel>256M:64M</crash_kernel></screen></entry> <entry>required</entry> </row> </tbody> </tgroup> </table> - </para> </section>  @@ -304,7 +298,6 @@ <title> Summary </title> - <para> <table frame='top'> <title>XML representation of the dump target settings</title> <tgroup cols="3"> @@ -318,38 +311,37 @@ <tbody> <row> <entry>KDUMP_SAVEDIR</entry> - <entry>An URL that specifies the target to which the dump and related files will be saved. - <para><screen><KDUMP_SAVEDRIR>file:///var/crash/</KDUMP_SAVEDIR></screen></para></entry> + <entry><para>An URL that specifies the target to which the dump and related files will be saved. + </para><screen><KDUMP_SAVEDRIR>file:///var/crash/</KDUMP_SAVEDIR></screen></entry> <entry>required</entry> </row> <row> <entry>KDUMP_COPY_KERNEL</entry> - <entry>If not only the dump itself should be saved to <literal>KDUMP_SAVEDIR</literal> but + <entry><para>If not only the dump itself should be saved to <literal>KDUMP_SAVEDIR</literal> but also the kernel and its debugging information (if installed). - <para><screen><KDUMP_COPY_KERNEL>false</KDUMP_COPY_KERNEL></screen></para></entry> + </para><screen><KDUMP_COPY_KERNEL>false</KDUMP_COPY_KERNEL></screen></entry> <entry>optional</entry> </row> <row> <entry>KDUMP_FREE_DISK_SIZE</entry> <entry> - The number of megabytes that should always be free after saving the dump. If that + <para>The number of megabytes that should always be free after saving the dump. If that space would be below that value, the dump will not be copied. - <para><screen><KDUMP_FREE_DISK_SIZE>64</KDUMP_FREE_DISK_SIZE></screen></para></entry> + </para><screen><KDUMP_FREE_DISK_SIZE>64</KDUMP_FREE_DISK_SIZE></screen></entry> <entry>optional</entry> </row> <row> <entry>KDUMP_KEEP_OLD_DUMPS</entry> <entry> - The number of dumps that are kept (i.e., not deleted) if <literal>KDUMP_SAVEDIR</literal> + <para>The number of dumps that are kept (i.e., not deleted) if <literal>KDUMP_SAVEDIR</literal> points to a local directory. Specify 0 if you don't want to delete dumps at all and specify -1 if all dumps (except the one that is just saved) should be deleted. - <para><screen><KDUMP_KEEP_OLD_DUMPS>4</KDUMP_KEEP_OLD_DUMPS></screen></para></entry> + </para><screen><KDUMP_KEEP_OLD_DUMPS>4</KDUMP_KEEP_OLD_DUMPS></screen></entry> <entry>optional</entry> </row> </tbody> </tgroup> </table> - </para> </section>  @@ -389,7 +381,6 @@ That may be added in future. </para> - <para>  <table frame='top'> <title>XML representation of the email notification settings</title> @@ -404,49 +395,50 @@ <tbody> <row> <entry>KDUMP_NOTIFICATION_TO</entry> - <entry>Exactly one email address (and only an address) to which the mail + <entry> + <para> + Exactly one email address (and only an address) to which the mail should be sent. Additional recipients can be specified in <literal>KDUMP_NOTIFICATION_CC</literal>. - <para><screen><KDUMP_NOTIFICATION_TO>bwalle(a)suse.de</KDUMP_NOTIFICATION_TO></screen></para></entry> + </para><screen><KDUMP_NOTIFICATION_TO>bwalle(a)suse.de</KDUMP_NOTIFICATION_TO></screen></entry> <entry>optional (email notification is disabled if empty)</entry> </row> <row> <entry>KDUMP_NOTIFICATION_CC</entry> - <entry>Zero, one or more recipients that are in the Cc line of the notification mail. - <para><screen><KDUMP_NOTIFICATION_CC>spam(a)suse.de devnull(a)suse.de</KDUMP_NOTIFICATION_CC></screen></para></entry> + <entry><para>Zero, one or more recipients that are in the Cc line of the notification mail. + </para><screen><KDUMP_NOTIFICATION_CC>spam(a)suse.de devnull(a)suse.de</KDUMP_NOTIFICATION_CC></screen></entry> <entry>optional</entry> </row> <row> <entry>KDUMP_SMTP_SERVER</entry> - <entry> + <entry><para> Host name of the SMTP server that will be used for the mail delivery. Please note that the SMTP authentication is supported (see <literal>KDUMP_SMTP_USER</literal> and <literal>KDUMP_SMTP_PASSWORD</literal>) but TSL and SSL are <emphasis>not</emphasis> supported. - <para><screen><KDUMP_SMTP_SERVER>email.suse.de</KDUMP_SMTP_SERVER></screen></para></entry> + </para><screen><KDUMP_SMTP_SERVER>email.suse.de</KDUMP_SMTP_SERVER></screen></entry> <entry>optional (email notification is disabled if empty)</entry> </row> <row> <entry>KDUMP_SMTP_USER</entry> - <entry> + <entry><para> User name that is used together with <literal>KDUMP_SMTP_PASSWORD</literal> for SMTP authentication. - <para><screen><KDUMP_SMTP_USER>bwalle</KDUMP_SMTP_USER></screen></para></entry> + </para><screen><KDUMP_SMTP_USER>bwalle</KDUMP_SMTP_USER></screen></entry> <entry>optional</entry> </row> <row> <entry>KDUMP_SMTP_PASSWORD</entry> - <entry> + <entry><para> Password that is used together with <literal>KDUMP_SMTP_USER</literal> for SMTP authentication. - <para><screen><KDUMP_SMTP_PASSWORD>geheim</KDUMP_SMTP_PASSWORD></screen></para></entry> + </para><screen><KDUMP_SMTP_PASSWORD>geheim</KDUMP_SMTP_PASSWORD></screen></entry> <entry>optional</entry> </row> </tbody> </tgroup> </table>  - </para> </section>   @@ -477,7 +469,6 @@ and you want to specify the whole command line, set <literal>KDUMP_COMMANDLINE</literal>. </para> - <para>  <table frame='top'> <title>XML representation of the kernel settings</title> @@ -492,31 +483,30 @@ <tbody> <row> <entry>KDUMP_KERNELVER</entry> - <entry>Version string for the kernel that will be used for kdump. Leave it + <entry><para>Version string for the kernel that will be used for kdump. Leave it empty to use the auto-detection mechanism (strongly recommended). - <para><screen><KDUMP_KERNELVER>2.6.27-default</KDUMP_KERNELVER></screen></para></entry> + </para><screen><KDUMP_KERNELVER>2.6.27-default</KDUMP_KERNELVER></screen></entry> <entry>optional (auto-detection if empty)</entry> </row> <row> <entry>KDUMP_COMMANDLINE_APPEND</entry> - <entry>Additional command line parameters for the kdump kernel. - <para><screen><KDUMP_COMMANDLINE_APPEND>console=ttyS0,57600</KDUMP_COMMANDLINE_APPEND></screen></para></entry> + <entry><para>Additional command line parameters for the kdump kernel. + </para><screen><KDUMP_COMMANDLINE_APPEND>console=ttyS0,57600</KDUMP_COMMANDLINE_APPEND></screen></entry> <entry>optional</entry> </row> <row> <entry>KDUMP_COMMANDLINE</entry> - <entry> + <entry><para> Overwrite the automatically generated kdump command line. Use with care. Normally <literal>KDUMP_COMMANDLINE_APPEND</literal> is the setting you're looking for. - <para><screen><KDUMP_COMMANDLINE_APPEND>root=/dev/sda5 maxcpus=1 irqpoll</KDUMP_COMMANDLINE></screen></para></entry> + </para><screen><KDUMP_COMMANDLINE_APPEND>root=/dev/sda5 maxcpus=1 irqpoll</KDUMP_COMMANDLINE></screen></entry> <entry>optional (email notification is disabled if empty)</entry> </row> </tbody> </tgroup> </table>  - </para> </section>   @@ -525,7 +515,6 @@ Expert settings </title> - <para>  <table frame='top'> <title>XML representation of the expert settings</title> @@ -540,31 +529,30 @@ <tbody> <row> <entry>KDUMP_IMMEDIATE_REBOOT</entry> - <entry><literal>true</literal> if the system should be rebooted automatically + <entry><para><literal>true</literal> if the system should be rebooted automatically after the dump has been saved, <literal>false</literal> otherwise. The default is to reboot the system automatically. - <para><screen><KDUMP_IMMEDIATE_REBOOT>true</KDUMP_IMMEDIATE_REBOOT></screen></para></entry> + </para><screen><KDUMP_IMMEDIATE_REBOOT>true</KDUMP_IMMEDIATE_REBOOT></screen></entry> <entry>optional</entry> </row> <row> <entry>KDUMP_VERBOSE</entry> - <entry>Bitmask that specifies how to verbose the kdump process should be. + <entry><para>Bitmask that specifies how to verbose the kdump process should be. Read kdump(5) for details. - <para><screen><KDUMP_VERBOSE>3</KDUMP_VERBOSE></screen></para></entry> + </para><screen><KDUMP_VERBOSE>3</KDUMP_VERBOSE></screen></entry> <entry>optional</entry> </row> <row> <entry>KEXEC_OPTIONS</entry> - <entry>Additional options that are passed to <application>kexec</application> + <entry><para>Additional options that are passed to <application>kexec</application> when loading the kdump kernel. Normally empty. - <para><screen><KEXEC_OPTIONS>--noio</KEXEC_OPTIONS></screen></para></entry> + </para><screen><KEXEC_OPTIONS>--noio</KEXEC_OPTIONS></screen></entry> <entry>optional</entry> </row> </tbody> </tgroup> </table>  - </para> </section>  Modified: trunk/autoinstallation/doc/xml/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Makefil… ============================================================================== --- trunk/autoinstallation/doc/xml/Makefile.am (original) +++ trunk/autoinstallation/doc/xml/Makefile.am Wed Oct 26 12:55:58 2011 @@ -16,7 +16,8 @@ CLEANFILES = .html.sum profile.dtd.xml elements \ elements.xml elements.ent profile.dtd.xml examples.ent\ components.ent .ps.sum autoyast.out autoyast.pdf autoyast.fo \ - images.ent + images.ent \ + ay_bigfile_docbook.xml ay_bigfile_novdoc.xml ay_bigfile.xml STYLESHEET_CSS = default.css @@ -59,13 +60,32 @@ cp images/PNG/*png ../images/src/png ay_bigfile_docbook.xml: prep-daps-images +# Remove internal entity statements ay_bigfile_docbook.xml: autoyast.xml { head -n 3 $< ; \ XML_CATALOG_FILES=@XML_CATALOG@ \ xmllint --xinclude --noent --nocdata -o - $< \ | awk 'BEGIN{b=0}; /^]>/ && b == 0 {b=1}; b == 1 {print}' \ - | sed 's|fileref=\"img/|fileref=\"|' ; } > $@ + | sed -e 's|fileref=\"img/|fileref=\"|' \ + -e 's|<acronym>|<phrase role=\"acronym\">|g' \ + -e 's|</acronym>|</phrase>|g' \ + -e 's|<caution>|<note>|g' \ + -e 's|</caution>|</note>|g' \ + -e 's|<literallayout|<screen|g' \ + -e 's|</literallayout>|</screen>|g' \ + -e 's|<orderedlist numeration=\"arabic\">|<orderedlist>|g' \ + -e 's|title id=[^>]*|title|' \ + -e 's|endterm=[^/]*||' \ + -e 's|frame=\"top\"||g' \ + -e "s|frame='top'||g" \ + -e 's|revision=\"1\"||g' \ + -e 's|align=\"center\"||' ; } > $@ + +ay_bigfile.xml: ay_bigfile_docbook.xml + xsltproc --output $@ \ + /usr/share/susedoc/xslt/misc/db2novdoc.xsl $< +# Not in use; use ay_bigfile.xml ay_bigfile_novdoc.xml: prep-daps-images ay_bigfile_novdoc.xml: autoyast.xml { echo '<?xml version="1.0" encoding="UTF-8"?>'; \ Modified: trunk/autoinstallation/doc/xml/NetworkSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Network… ============================================================================== --- trunk/autoinstallation/doc/xml/NetworkSection.xml (original) +++ trunk/autoinstallation/doc/xml/NetworkSection.xml Wed Oct 26 12:55:58 2011 @@ -34,9 +34,11 @@ </para> <para> In the networking section, when this option is set to true (default is false, this option is available since openSUSE 11.2 but not SLES11): + </para> <screen> <keep_install_network config:type="boolean">true</keep_install_network> </screen> + <para> YaST will keep network settings created during installation (via Linuxrc) and/or merge it with network settings from the AutoYaST profile (if these are defined). AutoYaST settings have higher priority than already present configuration files. Modified: trunk/autoinstallation/doc/xml/PartitioningSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Partiti… ============================================================================== --- trunk/autoinstallation/doc/xml/PartitioningSection.xml (original) +++ trunk/autoinstallation/doc/xml/PartitioningSection.xml Wed Oct 26 12:55:58 2011 @@ -45,49 +45,49 @@ <tbody> <row> <entry>device</entry> - <entry>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/ata-WDC_WD3200AAKS-75L9A0_WD-WMAV27368122</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>. - <para><screen><device>/dev/hda</device></screen></para> + <entry><para>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/ata-WDC_WD3200AAKS-75L9A0_WD-WMAV27368122</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>.</para> + <para><literal><device>/dev/hda</device></literal></para> </entry> <entry>optional. If left out, autoyast tries to guess the device. A RAID must always have "/dev/md" as device</entry> </row> <row> <entry>initialize</entry> - <entry>if set to true, the partition table gets wiped out before autoyast starts the partition calculation -<para><screen><initialize config:type="boolean">true</initialize></screen></para> + <entry><para>if set to true, the partition table gets wiped out before autoyast starts the partition calculation</para> +<para><literal><initialize config:type="boolean">true</initialize></literal></para> </entry> <entry>optional. The default is false.</entry> </row> <row> <entry>is_lvm_vg</entry> - <entry>This tells autoyast that this device is not a physical device but a LVM volume group (see LVM configuration below) -<para><screen><is_lvm_vg config:type="boolean">true</is_lvm_vg></screen></para> + <entry><para>This tells autoyast that this device is not a physical device but a LVM volume group (see LVM configuration below)</para> +<para><literal><is_lvm_vg config:type="boolean">true</is_lvm_vg></literal></para> </entry> - <entry>DEPRECATED since SLES10SP1 and SL10.2 - use <emphasis>type</emphasis> instead. Must be true if this device is a LVM volume group. The default is false.</entry> + <entry><para>DEPRECATED since SLES10SP1 and SL10.2 - use <emphasis>type</emphasis> instead. Must be true if this device is a LVM volume group. The default is false.</para></entry> </row> <row> <entry>is_evms_vg</entry> - <entry>this tells autoyast that this device is not a physical device but an EVMS volume group (see EVMS configuration below) -<para><screen><is_evms_vg config:type="boolean">true</is_evms_vg></screen></para> + <entry><para>this tells autoyast that this device is not a physical device but an EVMS volume group (see EVMS configuration below)</para> +<para><literal><is_evms_vg config:type="boolean">true</is_evms_vg></literal></para> </entry> - <entry>DEPRECATED since SLES10SP1 and SL10.2 - use <emphasis>type</emphasis> instead. Must be true if this device is an EVMS volume group. The default is false.</entry> + <entry><para>DEPRECATED since SLES10SP1 and SL10.2 - use <emphasis>type</emphasis> instead. Must be true if this device is an EVMS volume group. The default is false.</para></entry> </row> <row> <entry>partitions</entry> - <entry>this is a list of <partition> entries (see table below) -<para><screen><partitions config:type="list"><partition>...</partition>...</partitions></screen></para> + <entry><para>this is a list of <partition> entries (see table below)</para> +<para><literal><partitions config:type="list"><partition>...</partition>...</partitions></literal></para> </entry> <entry>optional. If no partition is specified, autoyast will create it's own idea of a nice partitioning (see Automated Partitioning below).</entry> </row> <row> <entry>pesize</entry> - <entry>this value makes only sense with LVM/EVMS. -<para><screen><pesize>8M</pesize></screen></para> + <entry><para>this value makes only sense with LVM/EVMS.</para> +<para><literal><pesize>8M</pesize></literal></para> </entry> <entry>optional. Default is 4M for EVMS/LVM volume groups.</entry> </row> <row> <entry>use</entry> - <entry>this parameter tells autoyast which strategy it shall use to partition the harddisc. + <entry><para>this parameter tells autoyast which strategy it shall use to partition the harddisc.</para> <para>You can choose between:</para> <itemizedlist> <listitem> @@ -108,8 +108,8 @@ </row> <row> <entry>type</entry> - <entry>this value describes the type of the <emphasis>drive</emphasis> and is a replacement for -<emphasis>is_lvm_vg</emphasis> and <emphasis>is_evms_vg</emphasis> used in SLES10 and SL10.1 + <entry><para>this value describes the type of the <emphasis>drive</emphasis> and is a replacement for +<emphasis>is_lvm_vg</emphasis> and <emphasis>is_evms_vg</emphasis> used in SLES10 and SL10.1</para> <para>You can choose between:</para> <itemizedlist> <listitem> @@ -123,13 +123,13 @@ </listitem> </itemizedlist> -<para><screen><type config:type="symbol">CT_LVM</type></screen></para> +<para><literal><type config:type="symbol">CT_LVM</type></literal></para> </entry> <entry>optional. Default is CT_DISK for a normal physical harddisk.</entry> </row> <row> <entry>disklabel</entry> - <entry>this value describes the type of the partition table + <entry><para>this value describes the type of the partition table</para> <para>You can choose between:</para> <itemizedlist> <listitem> @@ -140,14 +140,14 @@ </listitem> </itemizedlist> -<para><screen><disklabel>gpt</disklabel></screen></para> +<para><literal><disklabel>gpt</disklabel></literal></para> </entry> <entry>optional and available since openSUSE 12.1 and SLES11 SP2. Default is to let yast decide what makes sense (msdos in most cases)</entry> </row> <row> <entry>keep_unknown_lv</entry> - <entry>This value only makes sense for type=CT_LVM drives. If you are reusing a LVG and you set this to true, all existing LVs in that VG won't be touched unless they are specified in the <partitioning> section. So you can keep existing LVs without need to specify them. -<para><screen><keep_unknown_lv config:type="boolean">false</keep_unknown_lv></screen></para> + <entry><para>This value only makes sense for type=CT_LVM drives. If you are reusing a LVG and you set this to true, all existing LVs in that VG won't be touched unless they are specified in the <partitioning> section. So you can keep existing LVs without need to specify them.</para> +<para><literal><keep_unknown_lv config:type="boolean">false</keep_unknown_lv></literal></para> </entry> <entry>optional and available since openSUSE 12.1 and SLES11 SP2. The default is false</entry> </row> @@ -177,7 +177,7 @@ <para> the "create" tells autoyast if this partition must be created or if it's already existing </para> - <para><screen><create config:type="boolean">false</create></screen></para> + <para><literal><create config:type="boolean">false</create></literal></para> </entry> <entry>if set to false, there must be some information for autoyast which partition this is (like with partition_nr)</entry> </row> @@ -187,8 +187,8 @@ <para> the mountpoint of this partition. </para> - <para><screen><mount>/</mount></screen></para> - <para><screen><mount>swap</mount></screen></para> + <para><literal><mount>/</mount></literal></para> + <para><literal><mount>swap</mount></literal></para> </entry> <entry>you should have at least a root partition (/) and a swap partition</entry> </row> @@ -198,7 +198,7 @@ <para> mount options for this partition </para> - <para><screen><fstopt>ro,noatime,user,data=ordered,acl,user_xattr</fstopt></screen></para> + <para><literal><fstopt>ro,noatime,user,data=ordered,acl,user_xattr</fstopt></literal></para> </entry> <entry>see "man mount" for the mountoptions you can use</entry> </row> @@ -208,7 +208,7 @@ <para> the label the partition has (useful for the "mountby" parameter - see below). </para> - <para><screen><label>mydata</label></screen></para> + <para><literal><label>mydata</label></literal></para> </entry> <entry>see "man e2label" for example.</entry> </row> @@ -218,7 +218,7 @@ <para> the uuid the partition has (only useful for the "mountby" parameter - see below). </para> - <para><screen><uuid>1b4e28ba-2fa1-11d2-883f-b9a761bde3fb</uuid></screen></para> + <para><literal><uuid>1b4e28ba-2fa1-11d2-883f-b9a761bde3fb</uuid></literal></para> </entry> <entry>see "man uuidgen"</entry> </row> @@ -234,7 +234,7 @@ with SUSE Linux 10.2 and SLES10 SP1, you can specify the the size in percentage. So 10% will use 10% of the size of the harddisk/VG. You can mix auto,max,sizes and percentage like you want. </para> - <para><screen><size>10G</size></screen></para> + <para><literal><size>10G</size></literal></para> </entry> <entry></entry> </row> @@ -244,7 +244,7 @@ <para> shall autoyast format the partition? </para> - <para><screen><format config:type="boolean">false</format></screen></para> + <para><literal><format config:type="boolean">false</format></literal></para> </entry> <entry>if "create" is true, then it's very likely that this is true too</entry> </row> @@ -253,6 +253,7 @@ <entry> <para> what filesystem is used on this partition? + </para> <itemizedlist> <listitem> <para>reiser (the default)</para> @@ -273,8 +274,8 @@ <para>swap</para> </listitem> </itemizedlist> - </para> - <para><screen><filesystem config:type="symbol">reiser</filesystem></screen></para> + + <para><literal><filesystem config:type="symbol">reiser</filesystem></literal></para> </entry> <entry>optional. The default is reiser</entry> </row> @@ -286,7 +287,7 @@ autoyast which partition you mean by the partition_nr. You can force autoyast to create only primary partitions by configuring only partition numbers below 5. </para> - <para><screen><partition_nr config:type="integer">2</partition_nr></screen></para> + <para><literal><partition_nr config:type="integer">2</partition_nr></literal></para> </entry> <entry>in most cases nr. 1-4 are primary partitions and 5-... are logical partitions</entry> </row> @@ -297,7 +298,7 @@ the partition_id configures the id of the partition. If you want something else than 131 for linux partition or 130 for swap, you must configure that with partition_id. </para> - <para><screen><partition_id config:type="integer">131</partition_id></screen></para> + <para><literal><partition_id config:type="integer">131</partition_id></literal></para> </entry> <entry>the default is 131 for linux partition. 130 for swap is set by autoyast itself too.</entry> </row> @@ -307,7 +308,7 @@ <para> look at partition_id above. For historical reasons they represent the same. </para> - <para><screen><filesystem_id config:type="integer">131</filesystem_id></screen></para> + <para><literal><filesystem_id config:type="integer">131</filesystem_id></literal></para> </entry> <entry>since 10.1 and SLES10 it's recommended to use partition_id instead.</entry> </row> @@ -317,7 +318,7 @@ <para> instead of a partition number, you can tell autoyast to mount a partition by label, uuid, path or id which are the udev path and udev id (see /dev/disk/...) </para> - <para><screen><mountby config:type="symbol">label</mountby></screen></para> + <para><literal><mountby config:type="symbol">label</mountby></literal></para> </entry> <entry>see "label" and "uuid" documentation above</entry> </row> @@ -329,7 +330,7 @@ (see is_lvm_vg/is_evms_vg parameter in drive configuration) you must specifiy the logical volume name here. </para> - <para><screen><lv_name>opt_lv</lv_name></screen></para> + <para><literal><lv_name>opt_lv</lv_name></literal></para> </entry> <entry></entry> </row> @@ -339,7 +340,7 @@ <para> It's an integer that tells AutoYaST to do LVM striping. You can configure across how man devices you want to stripe </para> - <para><screen><stripes config:type="integer">2</stripes></screen></para> + <para><literal><stripes config:type="integer">2</stripes></literal></para> </entry> <entry></entry> </row> @@ -349,7 +350,7 @@ <para> It's an integer that tells AutoYaST the size of each block in kb </para> - <para><screen><stripesize config:type="integer">4</stripesize></screen></para> + <para><literal><stripesize config:type="integer">4</stripesize></literal></para> </entry> <entry></entry> </row> @@ -361,7 +362,7 @@ you have to specify the name of the volume group here. </para> - <para><screen><lvm_group>system</lvm_group></screen></para> + <para><literal><lvm_group>system</lvm_group></literal></para> </entry> <entry></entry> </row> @@ -372,7 +373,7 @@ if this physical partition is used by a volume group (EVMS), you have to specify the name of the volume group here. </para> - <para><screen><evms_group>system</evms_group></screen></para> + <para><literal><evms_group>system</evms_group></literal></para> </entry> <entry></entry> </row> @@ -382,7 +383,7 @@ <para> this physical volume is part of a RAID and the name of the raid is specified here. </para> - <para><screen><raid_name>/dev/md0</raid_name></screen></para> + <para><literal><raid_name>/dev/md0</raid_name></literal></para> </entry> <entry></entry> </row> @@ -392,7 +393,7 @@ <para> this physical volume is part of a RAID and the type of the raid is specified here.. </para> - <para><screen><raid_type>raid1</raid_type></screen></para> + <para><literal><raid_type>raid1</raid_type></literal></para> </entry> <entry></entry> </row> @@ -402,7 +403,7 @@ <para> special options for the raid are specified here. See below. </para> - <para><screen><raid_options>...</raid_options></screen></para> + <para><literal><raid_options>...</raid_options></literal></para> </entry> <entry></entry> </row> @@ -419,7 +420,7 @@ <emphasis>800M</emphasis>. <emphasis>max</emphasis> and <emphasis>auto</emphasis> don't work as size here. </para> - <para><screen><resize config:type="boolean">false</resize></screen></para> + <para><literal><resize config:type="boolean">false</resize></literal></para> </entry> <entry>The resize only works with physical disks. Not with LVM/EVMS volumes.</entry> </row> @@ -447,7 +448,7 @@ <entry> <para> </para> - <para><screen><chunk_size>4</chunk_size></screen></para> + <para><literal><chunk_size>4</chunk_size></literal></para> </entry> <entry></entry> </row> @@ -457,7 +458,7 @@ <para> possible values are: left_asymmetric, left_symmetric, right_asymmetric, right_symmetric and since SLES11 SP2 and openSUSE 12.1 you can use parity_first, parity_last, left_asymmetric_6, left_symmetric_6, right_asymmetric_6, right_symmetric_6, parity_first_6, n2, o2, f2, n3, o3, f3 for RAID6 and RAID10 </para> - <para><screen><parity_algorithm>left_asymmetric</parity_algorithm></screen></para> + <para><literal><parity_algorithm>left_asymmetric</parity_algorithm></literal></para> </entry> <entry></entry> </row> @@ -467,7 +468,7 @@ <para> possible values are raid0,raid1 and raid5 </para> - <para><screen><raid_type>raid1</raid_type></screen></para> + <para><literal><raid_type>raid1</raid_type></literal></para> </entry> <entry>the default is raid1</entry> </row> @@ -650,15 +651,15 @@ </para> <para> if you go into the "drive" section, you can add + </para> <screen> <![CDATA[ <initialize config:type="boolean">true</initialize> ]]> </screen> - which tells Autoyast to delete the partition table before it starts to analyse the +<para> which tells Autoyast to delete the partition table before it starts to analyse the actual partitioning and calculates it's partition plan. Of course this means, that you - can't keep any of your existing partitions. - </para> + can't keep any of your existing partitions.</para> </section> <section> <title>Mount Options</title> @@ -792,9 +793,9 @@ </figure> <para> - In this scenario and as shown in figure <quote><link + In this scenario and as shown in figure <quote><xref linkend='partitioning-keep1' - endterm="partitioning-keep1.title"/></quote> , &autoyast2; + endterm="partitioning-keep1.title"/></quote>, &autoyast2; should not in any case create any new partitions, instead it should search for certain partition types on the system and use them according to the partitioning plan in the control file. No Modified: trunk/autoinstallation/doc/xml/Profile.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Profile… ============================================================================== --- trunk/autoinstallation/doc/xml/Profile.xml (original) +++ trunk/autoinstallation/doc/xml/Profile.xml Wed Oct 26 12:55:58 2011 @@ -1,7 +1,8 @@ <chapter id="Profile"> <title>The Control File</title> - + <para> + </para> <section id="Profile.Intro"> <title> Introduction @@ -227,15 +228,12 @@ <para> Global profile attributes are used to define meta-data on resources and properties. Attributes are used to define context switching. They are also used for naming and - typing properties as shown in earlier sectionons - <footnote> - <para> + typing properties as shown in earlier sectionons. + Profile attributes are in a separate namespace so they don't have to be treated as reserved words in the default namespace. New ones can then be added without having to potentially alter existing profiles. - </para> - </footnote>. </para> <para> Profile attributes are defined in the configuration namespace and must @@ -276,10 +274,10 @@ </para> <para> Verfify your autoyast XML file + </para> <screen> /usr/bin/xmllint --noout --relaxng /usr/share/YaST2/schema/autoyast/rng/profile.rng myAutoYaSTProfile.xml </screen> - </para> </section> </section> Modified: trunk/autoinstallation/doc/xml/RulesAndClasses.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/RulesAn… ============================================================================== --- trunk/autoinstallation/doc/xml/RulesAndClasses.xml (original) +++ trunk/autoinstallation/doc/xml/RulesAndClasses.xml Wed Oct 26 12:55:58 2011 @@ -1,6 +1,8 @@ <chapter id="rulesandclass"> <title>Rules and Classes</title> + <para> + </para> <section id="rules"> <title>Rule based auto-installation</title> <para> @@ -203,7 +205,6 @@ <para> Here is an example for the use of a custom rules: </para> - <para> <screen> <![CDATA[ <rule> @@ -225,7 +226,6 @@ </rule> ]]> </screen> - </para> <para> The script in this rule can echo either "intel" or "non_intel" to STDOUT (the output of the grep command must be directed to /dev/null in this case). @@ -245,7 +245,7 @@ <para> you can have five different match_types: </para> - <para> + <itemizedlist> <listitem> <para> @@ -273,7 +273,7 @@ </para> </listitem> </itemizedlist> - </para> + <para> "greater" and "lower" can be used for memsize or totaldisk for example. They can match only on rules which return an integer value. @@ -293,7 +293,7 @@ You can do that with the "operator" element in the rules.xml file. Here is an example: </para> - <para> + <screen> <![CDATA[ <rule> @@ -313,7 +313,7 @@ </rule> ]]> </screen> - </para> + <para> Just "and" and "or" are possible operators and the default operator is "and". @@ -351,8 +351,7 @@ <para> If you are unsure about a value on your system, start an autoinstallation. If the proposal shows up, switch to the console via CTRL+ALT+F2 and run - <screen>/usr/lib/YaST2/bin/y2base ayast_probe ncurses - </screen>. It might help to to turn the confirmation on for this, so that + <command>/usr/lib/YaST2/bin/y2base ayast_probe ncurses</command>. It might help to to turn the confirmation on for this, so that the installation does not start in the background while you are watching the values. The textbox with the values is scrollable. </para> @@ -400,8 +399,8 @@ <row> <entry>mac</entry> <entry>MAC address of host</entry> - <entry>This attribute must always match exactly. (MAC addresses - to be matched should be in the form <emphasis>0080c8f6484c</emphasis></entry> + <entry><para>This attribute must always match exactly. (MAC addresses + to be matched should be in the form <emphasis>0080c8f6484c</emphasis></para></entry> </row> <row> <entry>linux</entry> @@ -502,48 +501,42 @@ <tbody> <row> <entry>dialog_nr</entry> - <entry>all rules with the same dialog_nr are presented on the same popup dialog so the same dialog_nr can appear in multiple rules. - <para><screen><dialog_nr config:type="integer">3</dialog_nr></screen></para> - </entry> + <entry><para>all rules with the same dialog_nr are presented on the same popup dialog so the same dialog_nr can appear in multiple rules. + </para><screen><dialog_nr config:type="integer">3</dialog_nr></screen></entry> <entry>This element is optional and the default for a missing dialog_nr is always "0". If you have one popup only anyway, you don't need to specify the dialog_nr</entry> </row> <row> <entry>element</entry> - <entry>each element needs a uniq id. Even if you have more than one dialog, you must not use the same id twice like an id "1" on dialog 1 and and id "1" on dialog 2. That's different than with <ask> dialogs, where you can have the same <element> id on multiple dialogs. - <para><screen><element config:type="integer">3</element></screen></para> - </entry> + <entry><para>each element needs a uniq id. Even if you have more than one dialog, you must not use the same id twice like an id "1" on dialog 1 and and id "1" on dialog 2. That's different than with <ask> dialogs, where you can have the same <element> id on multiple dialogs. + </para><screen><element config:type="integer">3</element></screen></entry> <entry>optional. If left out, autoyast adds his own id's internally but you can't use conflicts then (see below)</entry> </row> <row> <entry>title</entry> - <entry>the caption of the popup dialog - <para><screen><title>Desktop Selection</title></screen></para> - </entry> + <entry><para>the caption of the popup dialog + </para><screen><title>Desktop Selection</title></screen></entry> <entry>optional</entry> </row> <row> <entry>question</entry> - <entry>the question text is shown in the popup behind the checkbox. - <para><screen><question>KDE Desktop</question></screen></para> - </entry> + <entry><para>the question text is shown in the popup behind the checkbox. + </para><screen><question>KDE Desktop</question></screen></entry> <entry>optional. If you don't configure a text here, the name of the XML file that is triggered by this rule will be shown instead.</entry> </row> <row> <entry>timeout</entry> - <entry>a timeout in seconds after which the dialog will automatically "press" the okay button. Useful for a non blocking installation in combination with rules-dialogs. - <para><screen><timeout config:type="integer">30</timeout></screen></para> - </entry> + <entry><para>a timeout in seconds after which the dialog will automatically "press" the okay button. Useful for a non blocking installation in combination with rules-dialogs. + </para><screen><timeout config:type="integer">30</timeout></screen></entry> <entry>optional. A missing timeout will stop the installation process until the dialog is confirmed by the user.</entry> </row> <row> <entry>conflicts</entry> - <entry>a list of element id's (rules) that conflict with this rule. If this rule matches or is selected by the user, all conflicting rules are deselected and disabled in the popup. Take care that you don't create deadlocks. - <para><screen><conflicts config:type="list"> + <entry><para>a list of element id's (rules) that conflict with this rule. If this rule matches or is selected by the user, all conflicting rules are deselected and disabled in the popup. Take care that you don't create deadlocks. + </para><screen><conflicts config:type="list"> <element config:type="integer">1</element> <element config:type="integer">5</element> ... -</conflicts></screen></para> - </entry> +</conflicts></screen></entry> <entry>optional</entry> </row> </tbody> @@ -552,7 +545,6 @@ <para> Here is an example of how to use dialogs with rules: </para> - <para> <screen> <![CDATA[ <rules config:type="list"> @@ -615,7 +607,6 @@ </rules> ]]> </screen> - </para> </section> </section> @@ -633,7 +624,6 @@ <para> Here is an example of a class definition: </para> - <para> <screen> <![CDATA[ <classes config:type="list"> @@ -644,7 +634,6 @@ </classes> ]]> </screen> - </para> <para> The file Software.xml must be in the directory "classes/TrainingRoom/" then and it will get fetched from the same place like the autoyast profile and the rules were @@ -730,8 +719,8 @@ It is possible to mix rules and classes during an auto-installation session. For example you can identify a system using rules which contain class definitions in them. The process is described in the figures - <quote><link linkend='rulesflow' - endterm="rulesflow.title"></link></quote>. + <quote><xref linkend='rulesflow' + endterm="rulesflow.title"></xref></quote>. </para> <para> After retrieving the rules and merging them, the generated control file @@ -750,7 +739,6 @@ <para> Let's take a look at two XML parts that we want to merge: </para> - <para> <screen> <partitioning config:type="list"> <drive> @@ -772,8 +760,7 @@ </drive> </partitioning> </screen> - </para> - <para> + <screen> <partitioning config:type="list"> <drive> @@ -792,7 +779,7 @@ </drive> </partitioning> </screen> - </para> + <para> What you would expect is, that you'll end up in a profile with 3 partitions. That is not the case. You'll end up with two partitions and the first partition @@ -820,13 +807,13 @@ not official supported by autoyast and more a workaround than a nice solution. For each partition in one file, add an attribute to the partition like this: </para> - <para> + <screen> <partition dontmerge="1"> ... </partitions> </screen> - </para> + <para> The trick is, that the merge script will not detect the partitions as the same element type because of the new attribute. If you have more files, it might be needed to to add more attributes like <emphasis>dontmerge="2"</emphasis>. @@ -840,7 +827,7 @@ <para>you can use the <emphasis>dont_merge</emphasis> element in the rules or classes file like this: </para> - <para> + <screen> <classes config:type="list"> <class> @@ -852,8 +839,7 @@ </class> </classes> </screen> - </para> - <para> + <screen> <rule> <board_vendor> @@ -880,7 +866,7 @@ </result> </rule> </screen> - </para> + </section> </chapter> Modified: trunk/autoinstallation/doc/xml/ScriptsSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Scripts… ============================================================================== --- trunk/autoinstallation/doc/xml/ScriptsSection.xml (original) +++ trunk/autoinstallation/doc/xml/ScriptsSection.xml Wed Oct 26 12:55:58 2011 @@ -30,7 +30,7 @@ <remark>FIXME: Is this a title?</remark> <para>All scripts have to be in the <scritps> section.</para> - <para> + <itemizedlist> <listitem><para><emphasis>pre-scripts</emphasis> (very early, before anything else really happened)</para></listitem> <listitem><para><emphasis>postpartitioning-scripts</emphasis> (after partitioning and mounting to /mnt but before RPM installation - since openSUSE 11.2)</para></listitem> @@ -38,7 +38,7 @@ <listitem><para><emphasis>post-scripts</emphasis> (during the first boot of the installed system, no services running)</para></listitem> <listitem><para><emphasis>init-scripts</emphasis> (during the first boot of the installed system, all servies up and running)</para></listitem> </itemizedlist> - </para> + <section id="pre-install.scripts"> <title>Pre-Install Scripts</title> <para> @@ -67,7 +67,6 @@ <para> The following elements must be between the <scripts><pre-scripts config:type="list"><script> ... </script></pre-scripts>...</scripts> tags </para> - <para> <table frame='top'> <title>pre script XML representation</title> <tgroup cols="3"> @@ -81,72 +80,72 @@ <tbody> <row> <entry>location</entry> - <entry>you can define a location from where the script gets fetched. + <entry><para>you can define a location from where the script gets fetched. Locations can be the same like for the profile (http,ftp,nfs,...). - <para><screen><location>http://10.10.0.1/myPreScript.sh</location></screen></para></entry> + </para><screen><location>http://10.10.0.1/myPreScript.sh</location></screen></entry> <entry>either <location> or <source> must be defined</entry> </row> <row> <entry>source</entry> - <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want - to put the whole shell script into the XML profile, look at the location parameter. + <entry><para>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want + to put the whole shell script into the XML profile, look at the location parameter.</para> - <para><screen><source> + <screen><source> <![CDATA[ echo "Testing the pre script" > /tmp/pre-script_out.txt ]]> -</source></screen></para></entry> +</source></screen></entry> <entry>Either <location> or <source> must be defined</entry> </row> <row> <entry>interpreter</entry> - <entry>the interpreter that must be used for the script. Supported options are shell and perl. - <para><screen><interpreter>perl</interpreter></screen></para></entry> + <entry><para>the interpreter that must be used for the script. Supported options are shell and perl. + </para><screen><interpreter>perl</interpreter></screen></entry> <entry>optional (default is shell)</entry> </row> <row> <entry>filename</entry> - <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... - <para><screen><filename>myPreScript5.sh</filename></screen></para></entry> + <entry><para>the filename of the script. It will be stored in a temporary directory under /tmp/... + </para><screen><filename>myPreScript5.sh</filename></screen></entry> <entry>optional. The default is the type of the script (pre-scripts) in this case. If you have more than one script, you should set the filename to a reasonable value</entry> </row> <row> <entry>feedback</entry> - <entry>if this boolean is true, stdout and stderr of the script will be shown in a popup that the + <entry><para>if this boolean is true, stdout and stderr of the script will be shown in a popup that the user has to confirm via ok-button. If stdout and stderr are empty, no popup is shown and so no confirmation is needed. - <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry> + </para><screen><feedback config:type="boolean">true</feedback></screen></entry> <entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry> </row> <row> <entry>feedback_type</entry> - <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section. - <para><screen><feedback_type>warning</feedback_type></screen></para></entry> + <entry><para>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section. + </para><screen><feedback_type>warning</feedback_type></screen></entry> <entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry> </row> <row> <entry>debug</entry> - <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings + <entry><para>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings turned on. - <para><screen><debug config:type="boolean">true</debug></screen></para></entry> + </para><screen><debug config:type="boolean">true</debug></screen></entry> <entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry> </row> <row> <entry>notification</entry> - <entry>This text will be shown in a popup for the time the script is running in the background - <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry> + <entry><para>This text will be shown in a popup for the time the script is running in the background + </para><screen><notification>Please wait while script is running ...</notification></screen></entry> <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3/SLES11 SP2 (not SLES10)</entry> </row> <row> <entry>rerun</entry> - <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. - <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry> + <entry><para>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. + </para><screen><rerun config:type="boolean">true</rerun></screen></entry> <entry>optional. The default is false which makes scripts only run one time</entry> </row> </tbody> </tgroup> </table> - </para> + </section> <section id="postpartitioning-install.scripts"> @@ -161,7 +160,7 @@ <para> The following elements must be between the <scripts><postpartitioning-scripts config:type="list"><script> ... </script></postpartitioning-scripts>...</scripts> tags </para> - <para> + <table frame='top'> <title>postpartitioning script XML representation</title> <tgroup cols="3"> @@ -175,72 +174,71 @@ <tbody> <row> <entry>location</entry> - <entry>you can define a location from where the script gets fetched. + <entry><para>you can define a location from where the script gets fetched. Locations can be the same like for the profile (http,ftp,nfs,...). - <para><screen><location>http://10.10.0.1/myScript.sh</location></screen></para></entry> + </para><screen><location>http://10.10.0.1/myScript.sh</location></screen></entry> <entry>either <location> or <source> must be defined</entry> </row> <row> <entry>source</entry> - <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want + <entry><para>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want to put the whole shell script into the XML profile, look at the location parameter. - <para><screen><source> + </para><screen><source> <![CDATA[ echo "Testing postpart script" > /mnt/postpart_test.txt ]]> -</source></screen></para></entry> +</source></screen></entry> <entry>Either <location> or <source> must be defined</entry> </row> <row> <entry>interpreter</entry> - <entry>the interpreter that must be used for the script. Supported options are shell and perl. - <para><screen><interpreter>perl</interpreter></screen></para></entry> + <entry><para>the interpreter that must be used for the script. Supported options are shell and perl. + </para><screen><interpreter>perl</interpreter></screen></entry> <entry>optional (default is shell)</entry> </row> <row> <entry>filename</entry> - <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... - <para><screen><filename>myScript5.sh</filename></screen></para></entry> + <entry><para>the filename of the script. It will be stored in a temporary directory under /tmp/... + </para><screen><filename>myScript5.sh</filename></screen></entry> <entry>optional. The default is the type of the script (postpartitioning-scripts in this case). If you have more than one script, you should set the filename to a reasonable value</entry> </row> <row> <entry>feedback</entry> - <entry>if this boolean is true, stdout and stderr of the script will be shown in a popup that the + <entry><para>if this boolean is true, stdout and stderr of the script will be shown in a popup that the user has to confirm via ok-button. If stdout and stderr are empty, no popup is shown and so no confirmation is needed. - <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry> + </para><screen><feedback config:type="boolean">true</feedback></screen></entry> <entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry> </row> <row> <entry>feedback_type</entry> - <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section. - <para><screen><feedback_type>warning</feedback_type></screen></para></entry> + <entry><para>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section. + </para><screen><feedback_type>warning</feedback_type></screen></entry> <entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry> </row> <row> <entry>debug</entry> - <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings + <entry><para>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings turned on. - <para><screen><debug config:type="boolean">true</debug></screen></para></entry> + </para><screen><debug config:type="boolean">true</debug></screen></entry> <entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry> </row> <row> <entry>notification</entry> - <entry>This text will be shown in a popup for the time the script is running in the background - <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry> + <entry><para>This text will be shown in a popup for the time the script is running in the background + </para><screen><notification>Please wait while script is running ...</notification></screen></entry> <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3/SLES11 SP2 (not SLES10)</entry> </row> <row> <entry>rerun</entry> - <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. - <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry> + <entry><para>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. + </para><screen><rerun config:type="boolean">true</rerun></screen></entry> <entry>optional. The default is false which makes scripts only run one time</entry> </row> </tbody> </tgroup> </table> - </para> </section> @@ -257,7 +255,7 @@ <para> The following elements must be between the <scripts><chroot-scripts config:type="list"><script> ... </script></chroot-scripts>...</scripts> tags </para> - <para> + <table frame='top'> <title>chroot script XML representation</title> <tgroup cols="3"> @@ -271,79 +269,79 @@ <tbody> <row> <entry>location</entry> - <entry>you can define a location from where the script gets fetched. + <entry><para>you can define a location from where the script gets fetched. Locations can be the same like for the profile (http,ftp,nfs,...). - <para> + </para> <screen><location>http://10.10.0.1/myChrootScript.sh</location></screen> - </para></entry> + </entry> <entry>either <location> or <source> must be defined</entry> </row> <row> <entry>source</entry> - <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want + <entry><para>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want to put the whole shell script into the XML profile, look at the location parameter. - <para><screen><source> + </para><screen><source> <![CDATA[ echo "Testing the chroot script" > /tmp/chroot_out.txt ]]> -</source></screen></para></entry> +</source></screen></entry> <entry>either <location> or <source> must be defined</entry> </row> <row> <entry>chrooted</entry> - <entry>this value can be true or false. "False" means that the installed system is still mounted at "/mnt" and no chrooting has happened till now. The bootloader is not installed too at that stage. "True" means, we did a chroot into /mnt, so we are now in the installed system. The bootloader is installed and if you want to change anything in the installed system, you don't have to use the "/mnt/" prefix anymore. - <para><screen><chrooted config:type="boolean">true</chrooted></screen></para></entry> + <entry><para>this value can be true or false. "False" means that the installed system is still mounted at "/mnt" and no chrooting has happened till now. The bootloader is not installed too at that stage. "True" means, we did a chroot into /mnt, so we are now in the installed system. The bootloader is installed and if you want to change anything in the installed system, you don't have to use the "/mnt/" prefix anymore. + </para><screen><chrooted config:type="boolean">true</chrooted></screen></entry> <entry>optional (the default is false)</entry> </row> <row> <entry>interpreter</entry> - <entry>the interpreter that must be used for the script. Supported options are shell and perl.and if you are in a chrooted=true condition, you can use python too if it's installed. - <para><screen><interpreter>perl</interpreter></screen></para></entry> + <entry><para>the interpreter that must be used for the script. Supported options are shell and perl.and if you are in a chrooted=true condition, you can use python too if it's installed. + </para><screen><interpreter>perl</interpreter></screen></entry> <entry>optional (default is shell)</entry> </row> <row> <entry>filename</entry> - <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... - <para><screen><filename>myPreScript5.sh</filename></screen></para></entry> + <entry><para>the filename of the script. It will be stored in a temporary directory under /tmp/... + </para><screen><filename>myPreScript5.sh</filename></screen></entry> <entry>optional. The default is the type of the script (chroot-scripts) in this case. If you have more than one script, you should set the filename to a reasonable value</entry> </row> <row> <entry>feedback</entry> - <entry>if this boolean is true, stdout and stderr of the script will be shown in a popup that the + <entry><para>if this boolean is true, stdout and stderr of the script will be shown in a popup that the user has to confirm via ok-button. If stdout and stderr are empty, no popup is shown and so no confirmation is needed. - <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry> + </para><screen><feedback config:type="boolean">true</feedback></screen></entry> <entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry> </row> <row> <entry>feedback_type</entry> - <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section. - <para><screen><feedback_type>warning</feedback_type></screen></para></entry> + <entry><para>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section. + </para><screen><feedback_type>warning</feedback_type></screen></entry> <entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry> </row> <row> <entry>debug</entry> - <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings + <entry><para>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings turned on. - <para><screen><debug config:type="boolean">true</debug></screen></para></entry> + </para><screen><debug config:type="boolean">true</debug></screen></entry> <entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry> </row> <row> <entry>notification</entry> - <entry>This text will be shown in a popup for the time the script is running in the background - <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry> + <entry><para>This text will be shown in a popup for the time the script is running in the background + </para><screen><notification>Please wait while script is running ...</notification></screen></entry> <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3/SLES11 SP2 (not SLES10)</entry> </row> <row> <entry>rerun</entry> - <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. - <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry> + <entry><para>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. + </para><screen><rerun config:type="boolean">true</rerun></screen></entry> <entry>optional. The default is false which makes scripts only run one time</entry> </row> </tbody> </tgroup> </table> - </para> + </section> <section id="post-insall.scripts"> <title>Post-Install Scripts</title> @@ -360,7 +358,7 @@ <para> The following elements must be between the <scripts><post-scripts config:type="list"><script> ... </script></post-scripts>...</scripts> tags </para> - <para> + <table frame='top'> <title>post script XML representation</title> <tgroup cols="3"> @@ -374,80 +372,80 @@ <tbody> <row> <entry>location</entry> - <entry>you can define a location from where the script gets fetched. + <entry><para>you can define a location from where the script gets fetched. Locations can be the same like for the profile (http,ftp,nfs,...) but then you need a running network interface of course - <para> + </para> <screen><location>http://10.10.0.1/myPostScript.sh</location></screen> - </para></entry> + </entry> <entry>either <location> or <source> must be defined</entry> </row> <row> <entry>source</entry> - <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want + <entry><para>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want to put the whole shell script into the XML profile, look at the location parameter. - <para><screen><source> + </para><screen><source> <![CDATA[ echo "Testing the chroot script" > /tmp/chroot_out.txt ]]> -</source></screen></para></entry> +</source></screen></entry> <entry>either <location> or <source> must be defined</entry> </row> <row> <entry>network_needed</entry>  - <entry>this value can be true or false. On "false" the script will run after the yast modules like the user configuration and everything else are done. The network is configured but still not up and running. With this value on "true", the script runs before(!) all yast modules are configured. So there is no local user and no network is configured but the installation network is still up and running (of course only if you did a network installation). - <para><screen><network_needed config:type="boolean">true</network_needed></screen></para></entry> + <entry><para>this value can be true or false. On "false" the script will run after the yast modules like the user configuration and everything else are done. The network is configured but still not up and running. With this value on "true", the script runs before(!) all yast modules are configured. So there is no local user and no network is configured but the installation network is still up and running (of course only if you did a network installation). + </para><screen><network_needed config:type="boolean">true</network_needed></screen></entry> <entry>optional (the default is false)</entry> </row> <row> <entry>interpreter</entry> - <entry>the interpreter that must be used for the script. Supported options are shell, perl and python if it's installed. - <para><screen><interpreter>perl</interpreter></screen></para></entry> + <entry><para>the interpreter that must be used for the script. Supported options are shell, perl and python if it's installed. + </para><screen><interpreter>perl</interpreter></screen></entry> <entry>optional (default is shell)</entry> </row> <row> <entry>filename</entry> - <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... - <para><screen><filename>myPostScript5.sh</filename></screen></para></entry> + <entry><para>the filename of the script. It will be stored in a temporary directory under /tmp/... + </para><screen><filename>myPostScript5.sh</filename></screen></entry> <entry>optional. The default is the type of the script (post-scripts) in this case. If you have more than one script, you should set the filename to a reasonable value</entry> </row> <row> <entry>feedback</entry> - <entry>if this boolean is true, stdout and stderr of the script will be shown in a popup that the + <entry><para>if this boolean is true, stdout and stderr of the script will be shown in a popup that the user has to confirm via ok-button. If stdout and stderr are empty, no popup is shown and so no confirmation is needed. - <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry> + </para><screen><feedback config:type="boolean">true</feedback></screen></entry> <entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry> </row> <row> <entry>feedback_type</entry> - <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section. - <para><screen><feedback_type>warning</feedback_type></screen></para></entry> + <entry><para>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section. + </para><screen><feedback_type>warning</feedback_type></screen></entry> <entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry> </row> <row> <entry>debug</entry> - <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings + <entry><para>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings turned on. - <para><screen><debug config:type="boolean">true</debug></screen></para></entry> + </para><screen><debug config:type="boolean">true</debug></screen></entry> <entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry> </row> <row> <entry>notification</entry> - <entry>This text will be shown in a popup for the time the script is running in the background - <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry> + <entry><para>This text will be shown in a popup for the time the script is running in the background + </para><screen><notification>Please wait while script is running ...</notification></screen></entry> <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3/SLES11 SP2 (not SLES10)</entry> </row> <row> <entry>rerun</entry> - <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. - <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry> + <entry><para>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. + </para><screen><rerun config:type="boolean">true</rerun></screen></entry> <entry>optional. The default is false which makes scripts only run one time</entry> </row> </tbody> </tgroup> </table> - </para> + </section> <section id="init.scripts"> <title>Init Scripts</title> @@ -465,7 +463,7 @@ <para> The following elements must be between the <scripts><init-scripts config:type="list"><script> ... </script></init-scripts>...</scripts> tags </para> - <para> + <table frame='top'> <title>init script XML representation</title> <tgroup cols="3"> @@ -479,40 +477,40 @@ <tbody> <row> <entry>location</entry> - <entry>you can define a location from where the script gets fetched. + <entry><para>you can define a location from where the script gets fetched. Locations can be the same like for the profile (http,ftp,nfs,...) but then you need a running network interface of course - <para> + </para> <screen><location>http://10.10.0.1/myInitScript.sh</location></screen> - </para></entry> + </entry> <entry>either <location> or <source> must be defined</entry> </row> <row> <entry>source</entry> - <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want + <entry><para>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want to put the whole shell script into the XML profile, look at the location parameter. - <para><screen><source> + </para><screen><source> <![CDATA[ echo "Testing the init script" > /tmp/init_out.txt ]]> -</source></screen></para></entry> +</source></screen></entry> <entry>either <location> or <source> must be defined</entry> </row> <row> <entry>filename</entry> - <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... - <para><screen><filename>mynitScript5.sh</filename></screen></para></entry> + <entry><para>the filename of the script. It will be stored in a temporary directory under /tmp/... + </para><screen><filename>mynitScript5.sh</filename></screen></entry> <entry>optional. The default is the type of the script (init-scripts) in this case. If you have more than one script, you should set the filename to a reasonable value</entry> </row> <row> <entry>rerun</entry> - <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. - <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry> + <entry><para>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean. + </para><screen><rerun config:type="boolean">true</rerun></screen></entry> <entry>optional. The default is false which makes scripts only run one time</entry> </row> </tbody> </tgroup> </table> - </para> + <para> When added to the control file manually, the Modified: trunk/autoinstallation/doc/xml/SoftwareSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Softwar… ============================================================================== --- trunk/autoinstallation/doc/xml/SoftwareSection.xml (original) +++ trunk/autoinstallation/doc/xml/SoftwareSection.xml Wed Oct 26 12:55:58 2011 @@ -133,18 +133,22 @@ The <emphasis>yast/order</emphasis> and <emphasis>yast/instorder</emphasis> is no longer supported. Neither by AutoYaST nor by YaST. To add own RPMs to an installation source (that includes add-on products like the SDK) you have to add a file <emphasis>add_on_products</emphasis> to the CD1 of the main product. + </para> <screen> media_url [path_on_media [product_1 [product_2 [....]]] </screen> +<para> media_url is URL of the media itself path_on_media is path of the catalog on the media. If not present, / (root) is assumed product_1 and following are the names for products, which should be marked for installation. If no product is mentioned, all products found on the media are selected for installation. For example: - <screen> +</para><screen> http://192.168.66.6/SLES10/sdk/CD1 http://192.168.66.6/SLES10/CD1/updates </screen> - Besides that <emphasis>add_on_products</emphasis> file, you can use the autoyast profile to specify add-on products. For example: + <para> + Besides that <emphasis>add_on_products</emphasis> file, you can use the autoyast profile to specify add-on products. For example: + </para> <screen> <add-on> <add_on_products config:type="list"> @@ -158,7 +162,8 @@ </add_on_products> </add-on> </screen> - With that entry in the autoyast profile, the <emphasis>add_on_products</emphasis> file is not necessary. + <para> + With that entry in the autoyast profile, the <emphasis>add_on_products</emphasis> file is not necessary. Since openSUSE 11.0 AutoYaST can ask the user to make the add-on available intead of reporting a timed out error when the add-on can't be found at the given location. Set ask_on_error to true for that (the default is false). Your add-on can be on a different CD/DVD than the installation source then. </para> @@ -187,43 +192,43 @@ <tbody> <row> <entry>accept_unsigned_file</entry> - <entry>the installer will accept unsigned files like the content file - <para><screen><accept_unsigned_file config:type="boolean">true</accept_unsigned_file></screen></para> + <entry><para>the installer will accept unsigned files like the content file</para> + <para><literal><accept_unsigned_file config:type="boolean">true</accept_unsigned_file></literal></para> </entry> <entry>optional. If left out, autoyast lets yast decide what to do</entry> </row> <row> <entry>accept_file_without_checksum</entry> - <entry>the installer will accept files without a checksum in the content file - <para><screen><accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum></screen></para> + <entry><para>the installer will accept files without a checksum in the content file</para> + <para><literal><accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum></literal></para> </entry> <entry>optional. If left out, autoyast lets yast decide what to do</entry> </row> <row> <entry>accept_verification_failed</entry> - <entry>the installer will accept files where the verification of the signature failed. So the file was signed but the check failed. - <para><screen><accept_verification_failed config:type="boolean">true</accept_verification_failed></screen></para> + <entry><para>the installer will accept files where the verification of the signature failed. So the file was signed but the check failed.</para> + <para><literal><accept_verification_failed config:type="boolean">true</accept_verification_failed></literal></para> </entry> <entry>optional. If left out, autoyast lets yast decide what to do</entry> </row> <row> <entry>accept_unknown_gpg_key</entry> - <entry>the installer will accept new gpg keys on the installation source that are used to sign the content file for example - <para><screen><accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key></screen></para> + <entry><para>the installer will accept new gpg keys on the installation source that are used to sign the content file for example</para> + <para><literal><accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key></literal></para> </entry> <entry>optional. If left out, autoyast lets yast decide what to do</entry> </row> <row> <entry>accept_non_trusted_gpg_key</entry> - <entry>This basically means, we know the key, but it is not trusted - <para><screen><accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key></screen></para> + <entry><para>This basically means, we know the key, but it is not trusted</para> + <para><literal><accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key></literal></para> </entry> <entry>optional. If left out, autoyast lets yast decide what to do</entry> </row> <row> <entry>import_gpg_key</entry> - <entry>the installer will accept and import new gpg keys on the installation source in it's database. - <para><screen><import_gpg_key config:type="boolean">true</import_gpg_key></screen></para> + <entry><para>the installer will accept and import new gpg keys on the installation source in it's database.</para> + <para><literal><import_gpg_key config:type="boolean">true</import_gpg_key></literal></para> </entry> <entry>optional. If left out, autoyast lets yast decide what to do</entry> </row> @@ -248,64 +253,64 @@ <tbody> <row> <entry>accept_unsigned_file</entry> - <entry>the installer will accept unsigned files like the content file for this add-on product - <para><screen><accept_unsigned_file config:type="boolean">true</accept_unsigned_file></screen></para> + <entry><para>the installer will accept unsigned files like the content file for this add-on product</para> + <para><literal><accept_unsigned_file config:type="boolean">true</accept_unsigned_file></literal></para> </entry> <entry>optional. If left out, the global signature-handing in the <general> section is used.</entry> </row> <row> <entry>accept_file_without_checksum</entry> - <entry>the installer will accept files without a checksum in the content file for this add-on - <para><screen><accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum></screen></para> + <entry><para>the installer will accept files without a checksum in the content file for this add-on</para> + <para><literal><accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum></literal></para> </entry> <entry>optional. If left out, the global signature-handing in the <general> section is used.</entry> </row> <row> <entry>accept_verification_failed</entry> - <entry>the installer will accept files where the verification of the signature failed. So the file was signed but the check failed. - <para><screen><accept_verification_failed config:type="boolean">true</accept_verification_failed></screen></para> + <entry><para>the installer will accept files where the verification of the signature failed. So the file was signed but the check failed.</para> + <para><literal><accept_verification_failed config:type="boolean">true</accept_verification_failed></literal></para> </entry> <entry>optional. If left out, the global signature-handing in the <general> section is used.</entry> </row> <row> <entry>accept_unknown_gpg_key</entry> - <entry>the installer will accept new gpg keys on the installation source that are used to sign the content file for example - <para><screen> + <entry><para>the installer will accept new gpg keys on the installation source that are used to sign the content file for example</para> + <screen> <accept_unknown_gpg_key> <all config:type="boolean">false</all> <keys config:type="list"> <keyid>3B3011B76B9D6523</keyid> </keys> </accept_unknown_gpg_key> - </screen></para> + </screen> </entry> <entry>optional. If left out, the global signature-handing in the <general> section is used.</entry> </row> <row> <entry>accept_non_trusted_gpg_key</entry> - <entry>This basically means, we know the key, but it is not trusted - <para><screen> + <entry><para>This basically means, we know the key, but it is not trusted</para> + <screen> <accept_non_trusted_gpg_key> <all config:type="boolean">false</all> <keys config:type="list"> <keyid>3B3011B76B9D6523</keyid> </keys> </accept_non_trusted_gpg_key> -</screen></para> +</screen> </entry> <entry>optional. If left out, the global signature-handing in the <general> section is used.</entry> </row> <row> <entry>import_gpg_key</entry> - <entry>the installer will accept and import new gpg keys on the installation source in it's database. - <para><screen> + <entry><para>the installer will accept and import new gpg keys on the installation source in it's database.</para> + <screen> <import_gpg_key> <all config:type="boolean">false</all> <keys config:type="list"> <keyid>3B3011B76B9D6523</keyid> </keys> </import_gpg_key> - </screen></para> + </screen> </entry> <entry>optional. If left out, the global signature-handing in the <general> section is used.</entry> </row> Modified: trunk/autoinstallation/doc/xml/autoyast.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/autoyas… ============================================================================== --- trunk/autoinstallation/doc/xml/autoyast.xml (original) +++ trunk/autoinstallation/doc/xml/autoyast.xml Wed Oct 26 12:55:58 2011 @@ -41,33 +41,45 @@ ]> <book lang="en"> + <bookinfo> <title>AutoYaST</title> +  + <legalnotice> + <para> +  + </para> + </legalnotice> <authorgroup> <author> <firstname>Anas</firstname> <surname>Nashif</surname> +  </author> <author> <firstname>Uwe</firstname> <surname>Gansert</surname> +  </author> </authorgroup> - <corpauthor>SUSE Linux Products GmbH</corpauthor> - <copyright> - <year>2004</year> - <holder> &company-suse; Linux AG</holder> - </copyright> </bookinfo> &Introduction; @@ -84,15 +96,3 @@ &appendix-linuxrc; &Elements; </book> - - - - - - - - - - - - Added: trunk/autoinstallation/doc/xml/entity-decl.ent URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/entity-… ============================================================================== --- trunk/autoinstallation/doc/xml/entity-decl.ent (added) +++ trunk/autoinstallation/doc/xml/entity-decl.ent Wed Oct 26 12:55:58 2011 @@ -0,0 +1,251 @@ + + + + +<!ENTITY exampleuser "tux"> +<!ENTITY exampleuserII "wilber"> +<!ENTITY examplegroup "users"> + + + + + + +<!ENTITY exampledomainip "192.168.0"> +<!ENTITY exampledomain1ip "192.168.1"> +<!ENTITY exampledomain2ip "192.168.2"> + +<!ENTITY exampledomain2ipv6 "2002:c0a8:20a::"> +<!ENTITY exampleserver "sun"> +<!ENTITY exampleserverip "&exampledomainip;.20"> +<!ENTITY exampleserverfq "&exampleserver;.&exampledomain;"> +<!ENTITY exampleclient "earth"> +<!ENTITY exampleclientip "&exampledomainip;.1"> +<!ENTITY exampleclientfq "&exampleclient;.&exampledomain;"> +<!ENTITY exampleclientppp "ppp&exampleclient;"> +<!ENTITY exampleclientslip "sl&exampleclient;"> +<!ENTITY exampleclientuucp "uu&exampleclient;"> +<!ENTITY exampleclientII "venus"> +<!ENTITY exampleclientIIppp "ppp&exampleclientII;"> +<!ENTITY exampleclientIIslip "sl&exampleclientII;"> +<!ENTITY exampleclientIIuucp "uu&exampleclientII;"> + + +<!ENTITY rootuser '<systemitem class="username">root</systemitem>'> +<!ENTITY grub "GRUB"> + + +<!ENTITY lilo "LILO"> + +<!ENTITY sax "SaX2"> +<!ENTITY atomic-update "Atomic Update"> +<!ENTITY suse "SUSE"> +<!ENTITY novell "Novell"> +<!ENTITY suseconfig "SuSEconfig"> +<!ENTITY suselinux "&suse; Linux"> +<!ENTITY suseonsite "&suse; Studio Onsite"> +<!ENTITY suseonsitereg "&suseonsite;®"> + +<!ENTITY susestudio "&suse; Studio"> +<!ENTITY obs "&opensuse; Build Server"> +<!ENTITY xvendor "X.Org"> +<!ENTITY yast "YaST"> +<!ENTITY yastcc "&yast; Control Center"> +<!ENTITY gnomecc "GNOME Control Center"> +<!ENTITY ay "AutoYaST"> +<!ENTITY nm "NetworkManager"> +<!ENTITY fspot "f-spot"> +<!ENTITY digikam "digiKam"> +<!ENTITY yelp "Help"> +<!ENTITY khc "KDE help center"> +<!ENTITY umtsmon "UMTSmon"> + +<!ENTITY ooo "&libo;"> +<!ENTITY libo "LibreOffice"> +<!ENTITY aide "AIDE"> + + + + + +<!ENTITY deploy "Deployment Guide"> +<!ENTITY kdeuser "KDE User Guide"> +<!ENTITY gnomeuser "GNOME User Guide"> +<!ENTITY moblinuser "Moblin User Guide"> +<!ENTITY instquick "Installation Quick Start"> +<!ENTITY gnomequick "GNOME Quick Start"> +<!ENTITY kdequick "KDE Quick Start"> +<!ENTITY moblinquick "Moblin Quick Start"> +<!ENTITY oofficequick "&ooo; Quick Start"> +<!ENTITY apps "Application Guide"> +<!ENTITY admin "Administration Guide"> +<!ENTITY reference "Reference"> +<!ENTITY startup "Start-Up"> +<!ENTITY aaadmin "Novell AppArmor Administration Guide"> +<!ENTITY aaquick "Novell AppArmor Quick Start"> +<!ENTITY lfl "Lessons For Lizards"> +<!ENTITY storage "Storage Administration Guide"> +<!ENTITY haguide "High Availability Guide"> +<!ENTITY virtual "Virtualization Guide"> +<!ENTITY xenguide "Virtualization with &xen;"> +<!ENTITY kvmguide "Virtualization with &kvm;"> +<!ENTITY auditguide "The Linux Audit Framework"> +<!ENTITY auditquick "Linux Audit Quick Start"> +<!ENTITY tuning "System Analysis and Tuning Guide"> +<!ENTITY tuningsub "Problem Detection, Resolution, and Optimization"> +<!ENTITY secguide "Security Guide"> +<!ENTITY smtguide "Subscription Management Tool Guide"> +<!ENTITY webyastconfguide "WebYaST Configuration Guide"> +<!ENTITY studioadmin "Administration Guide"> +<!ENTITY studioinstall "Installation & Deployment Guide"> + + + + + + +<!ENTITY x86 "x86"> +<!ENTITY amd64 "AMD64"> +<!ENTITY s390 "S/390"> +<!ENTITY zseries "System z"> +<!ENTITY ipf "Itanium"> +<!ENTITY ipseries "POWER"> +<!ENTITY ppc "POWER"> +<!ENTITY em64t "Intel EM64T"> +<!ENTITY intel64 "Intel 64"> + + + + + + + + +<!ENTITY opensuse "openSUSE"> +<!ENTITY opensusereg "openSUSE®"> +<!ENTITY sle "SUSE Linux Enterprise"> +<!ENTITY sas "&sle; Advanced Server"> +<!ENTITY slereg "SUSE® Linux Enterprise"> +<!ENTITY slert "&sle; Real Time"> +<!ENTITY slerte "&slert; Extension"> +<!ENTITY slertreg "&slereg; Real Time"> +<!ENTITY slertereg "&slereg; Real Time Extension"> +<!ENTITY sls "SUSE Linux Enterprise Server"> +<!ENTITY slsa "SLES"> +<!ENTITY slsreg "SUSE® Linux Enterprise Server"> +<!ENTITY sled "SUSE Linux Enterprise Desktop"> +<!ENTITY sleda "SLED"> +<!ENTITY sledreg "SUSE® Linux Enterprise Desktop"> +<!ENTITY productname '<?suse name="productname"?>'> +<!ENTITY productnamereg '<?suse name="productnamereg"?>'> +<!ENTITY productnumber '<?suse name="productnumber"?>'> +<!ENTITY sdk "SUSE Software Development Kit"> +<!ENTITY slreg "SUSE® Linux"> +<!ENTITY slepos "SUSE Linux Enterprise Point of Service"> +<!ENTITY sleposreg "SUSE® Linux Enterprise Point of Service"> +<!ENTITY slert "&sle; Real Time"> +<!ENTITY slertreg "&slereg; Real Time"> +<!ENTITY hasi "High Availability Extension"> +<!ENTITY sletcreg "&slereg; Thin Client"> +<!ENTITY sletc "&sle; Thin Client"> +<!ENTITY sletca "SLETC"> +<!ENTITY tc "Thin Client"> +<!ENTITY nu "NU"> +<!ENTITY ncc "Novell Customer Center"> +<!ENTITY yup "yup"> +<!ENTITY imgcreat "Image Creator"> +<!ENTITY admserv "Administration Server"> +<!ENTITY branchserv "Branch Server"> +<!ENTITY imgserv "Image Building Server"> +<!ENTITY posbranchserv "POSBranch Server"> +<!ENTITY pos "Point of Service"> +<!ENTITY wy "WebYaST"> +<!ENTITY wyclient "&yast;2 Webclient"> +<!ENTITY wyservice "&yast;2 Webservice"> +<!ENTITY slms "SUSE Lifecycle Management Server"> +<!ENTITY slmsreg "SUSE® Lifecycle Management Server"> + + + + + +<!ENTITY musicplayer "Banshee"> +<!ENTITY musicplayerreg "Banshee™"> +<!ENTITY zenup "Software Updater"> +<!ENTITY updater "GNOME Update Applet/KDE Software Updater"> +<!ENTITY gupdater "Update Applet">  +<!ENTITY kupdater "Software Updater">  +<!ENTITY aa "AppArmor"> +<!ENTITY aareg "AppArmor®"> +<!ENTITY naa "Novell AppArmor"> +<!ENTITY naareg "Novell® AppArmor"> +<!ENTITY hb "Heartbeat"> +<!ENTITY hbvs "Heartbeat 2"> +<!ENTITY hbgui "Linux HA Management Client"> +<!ENTITY smtool "Subscription Management Tool"> +<!ENTITY smt "SMT"> +<!ENTITY xen "Xen"> +<!ENTITY xenreg "Xen®"> +<!ENTITY kvm "KVM"> +<!ENTITY vmhost "VM Host Server"> +<!ENTITY vmguest "VM Guest"> +<!ENTITY dom0 "Domain0"> +<!ENTITY libvirt '<systemitem class="library">libvirt</systemitem>'> +<!ENTITY libvirtd '<systemitem class="daemon">libvirtd</systemitem>'> +<!ENTITY vmm "Virtual Machine Manager"> +<!ENTITY qemu "QEMU"> +<!ENTITY pk "PolicyKit"> +<!ENTITY ha "High Availability"> +<!ENTITY ais "OpenAIS"> +<!ENTITY stonith "STONITH"> +<!ENTITY susefirewall "SuSEFirewall2"> +<!ENTITY pciback "PCI Pass-Through"> +<!ENTITY lvs "Linux Virtual Server"> +<!ENTITY krandr "KRandRTray"> +<!ENTITY amarok "Amarok"> +<!ENTITY digikam "digiKam"> +<!ENTITY postgresql "PostgreSQL"> +<!ENTITY mysql "MySQL"> +<!ENTITY jeos "JeOS"> +<!ENTITY stap "SystemTap"> +<!ENTITY oprof "OProfile"> +<!ENTITY cpufreq "CPUfreq"> +<!ENTITY powertop "powerTOP"> + + +<!ENTITY thrdmrk "*"> + + + + + +<!ENTITY ycc_runlevel "System Services (Runlevel)"> + + + + +<!ENTITY kiwi "KIWI"> +<!ENTITY cdcreator "CD Creator"> +<!ENTITY addoncreator "Add-on Creator"> +<!ENTITY imgcreator "Image Creator"> +<!ENTITY productcreator "Product Creator"> +<!ENTITY nomad "Nomad"> +<!ENTITY cpufreq "CPUfreq"> +<!ENTITY altf2 '<keycombo><keycap function="alt"/><keycap>F2</keycap></keycombo>'> + +<!ENTITY wypublic "/srv/www/yast/public/"> +<!ENTITY mac "<replaceable>MAC</replaceable>"> +<!ENTITY hwmac "hwtype.<replaceable>MAC</replaceable>"> +<!ENTITY confmac "config.<replaceable>MAC</replaceable>"> + + + +<!ENTITY euro "€"> + + +<!ENTITY % network-entities SYSTEM "network-decl.ent"> +%network-entities; + + + + Modified: trunk/autoinstallation/doc/xml/linuxrc.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/linuxrc… ============================================================================== --- trunk/autoinstallation/doc/xml/linuxrc.xml (original) +++ trunk/autoinstallation/doc/xml/linuxrc.xml Wed Oct 26 12:55:58 2011 @@ -35,7 +35,6 @@ kernel parameter that accidentally is recognized by Linuxrc, too), use <emphasis>linuxrc=nocmdline</emphasis>. </para> - <para> <note> <title>Change starting from SUSE Linux 10.2</title> <para> @@ -43,7 +42,6 @@ explicit, like 'info=floppy:/info'. </para> </note> - </para> <para> Independent of the above, Linuxrc will always look for and parse a file <filename>/linuxrc.config</filename>. You can use this file to change default @@ -57,17 +55,16 @@ <title>'info' file format</title> <para> Lines starting with '<emphasis>#</emphasis>' are comments, valid entries are of the form + </para> <screen> key: value - </screen> + </screen><para> Note that <emphasis>value</emphasis> extends to the end of the line and so may contain spaces. <emphasis>key</emphasis> is matched case insensitive. </para> <para> You can use the same key - value pairs on the kernel command line using the syntax - <interface> - key=value - </interface> + <literal>key=value</literal>. Lines that don't have the form described above are ignored. </para> <para> Added: trunk/autoinstallation/doc/xml/network-decl.ent URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/network… ============================================================================== --- trunk/autoinstallation/doc/xml/network-decl.ent (added) +++ trunk/autoinstallation/doc/xml/network-decl.ent Wed Oct 26 12:55:58 2011 @@ -0,0 +1,182 @@ + + + + + +<!ENTITY exampledomain "example.com"> +<!ENTITY exampledomain1 "example.net"> +<!ENTITY exampledomain2 "example.org"> + + +<!ENTITY subnetI "192.168.1"> +<!ENTITY subnetImask "&subnetI;.0/24"> +<!ENTITY subnetII "192.168.2"> +<!ENTITY subnetIImask "&subnetII;.0/24"> +<!ENTITY subnetIII "192.168.3"> +<!ENTITY subnetIIImask "&subnetIII;.0/24"> +<!ENTITY subnetIV "192.168.4"> +<!ENTITY subnetIVmask "&subnetIV;.0/24"> +<!ENTITY subnetV "192.168.5"> +<!ENTITY subnetVmask "&subnetV;.0/30"> +<!ENTITY subnetnat "192.168.100"> +<!ENTITY subnetnatmask "&subnetnat;.0/24"> + +<!ENTITY subnetv6 "2002:c0a8"> + + +<!ENTITY subnetIbc "&subnetI;.255"> +<!ENTITY subnetIIbc "&subnetII;.255"> +<!ENTITY subnetIIIbc "&subnetIII;.255"> +<!ENTITY subnetIVbc "&subnetIV;.255"> +<!ENTITY subnetVbc "&subnetV;.252"> + + +<!ENTITY subnetmask "255.255.255.0"> + + +<!ENTITY smbname "smb.&exampledomain;"> +<!ENTITY nfsname "nfs.&exampledomain;"> +<!ENTITY iscsiname "iscsi.&exampledomain;"> +<!ENTITY proxyname "www-proxy.&exampledomain;"> +<!ENTITY ldapname "ldap.&exampledomain;"> +<!ENTITY nisname "nis.&exampledomain;"> +<!ENTITY slpname "slp.&exampledomain;"> +<!ENTITY ntpname "ntp.&exampledomain;"> +<!ENTITY tftpname "tftp.&exampledomain;"> +<!ENTITY pxename "pxe.&exampledomain;"> +<!ENTITY kdcname "kdc.&exampledomain;"> +<!ENTITY dnsname "dns.&exampledomain;"> +<!ENTITY dhcpname "dhcp.&exampledomain;"> +<!ENTITY cupsname "cups.&exampledomain;"> + + +<!ENTITY wwwname "www.&exampledomain;"> +<!ENTITY wwwname1 "www.&exampledomain1;"> +<!ENTITY wwwname2 "www.&exampledomain2;"> +<!ENTITY ftpname "ftp.&exampledomain;"> +<!ENTITY mailname "mail.&exampledomain;"> +<!ENTITY routerextname "routerext.&exampledomain;"> +<!ENTITY routerintname "routerint.&exampledomain;"> +<!ENTITY fwextname "fwext.&exampledomain;"> +<!ENTITY fwintname "fwint.&exampledomain;"> +<!ENTITY gatename "gate.&exampledomain;"> + + +<!ENTITY wsIname "jupiter.&exampledomain;"> +<!ENTITY wsIIname "venus.&exampledomain;"> +<!ENTITY wsIIIname "saturn.&exampledomain;"> +<!ENTITY wsIVname "mercury.&exampledomain;"> + + +<!ENTITY wsI "jupiter"> +<!ENTITY wsII "venus"> +<!ENTITY wsIII "saturn"> +<!ENTITY wsIV "mercury"> + + +<!ENTITY xenhostname "earth.&exampledomain;"> +<!ENTITY xenhost "earth"> +<!ENTITY xenhostip "&subnetI;.20"> +<!ENTITY xenguestname "alice.&exampledomain;"> +<!ENTITY xenguest "alice"> +<!ENTITY xenguestip "&subnetI;.21"> +<!ENTITY xennatguest "dolly"> +<!ENTITY xennatip "&subnetnat;.1"> + + + +<!ENTITY wsImac "00:30:6E:08:EC:80"> +<!ENTITY wsIImac "00:00:1C:B5:A4:32"> +<!ENTITY wsIIImac "00:17:31:CA:A3:4A"> +<!ENTITY wsIVmac "00:16:35:AF:94:4B"> + + +<!ENTITY smbip "&subnetI;.110"> +<!ENTITY smbipv6 "&subnetv6;:16e::"> +<!ENTITY nfsip "&subnetI;.110"> +<!ENTITY nfsipv6 "&subnetv6;:16e::"> +<!ENTITY iscsiip "&subnetI;.111"> +<!ENTITY iscsiipv6 "&subnetv6;:16f::"> +<!ENTITY proxyip "&subnetI;.112"> +<!ENTITY proxyipv6 "&subnetv6;170::"> +<!ENTITY ldapip "&subnetI;.113"> +<!ENTITY ldapipv6 "&subnetv6;:171::"> +<!ENTITY nisip "&subnetI;.113"> +<!ENTITY nisipv6 "&subnetv6;:171::"> +<!ENTITY ntpip "&subnetI;.116"> +<!ENTITY ntpipv6 "&subnetv6:174::;"> +<!ENTITY tftpip "&subnetI;.115"> +<!ENTITY tftpipv6 "&subnetv6;:173::"> +<!ENTITY pxeip "&subnetI;.115"> +<!ENTITY pxeipv6 "&subnetv6;:173::"> +<!ENTITY kdcip "&subnetI;.114"> +<!ENTITY kdcipv6 "&subnetv6;:172::"> +<!ENTITY dnsip "&subnetI;.116"> +<!ENTITY dnsipv6 "&subnetv6;:174::"> +<!ENTITY vpnip "&subnetI;.120"> + + +<!ENTITY slpip "&subnetII;.254"> +<!ENTITY slpipv6 "&subnetv6;:2fe::"> +<!ENTITY dhcpip "&subnetII;.254"> +<!ENTITY dhcpipv6 "&subnetv6;:2fe::"> +<!ENTITY cupsip "&subnetII;.253"> +<!ENTITY cupsipv6 "&subnetv6;:2fd::"> + + +<!ENTITY routerintipI "&subnetI;.1"> +<!ENTITY routerintipIv6 "&subnetv6;:101::"> +<!ENTITY fwintipI "&subnetI;.1"> +<!ENTITY fwintipIv6 "&subnetv6;:101::"> + +<!ENTITY routerintipII "&subnetII;.1"> +<!ENTITY routerintipIIv6 "&subnetv6;:201::"> +<!ENTITY fwintipII "&subnetII;.1"> +<!ENTITY fwintipIIv6 "&subnetv6;:201::"> + +<!ENTITY wwwip "&subnetIII;.100"> +<!ENTITY wwwipv6 "&subnetv6;:364::"> +<!ENTITY wwwip1 "&subnetIII;.101"> +<!ENTITY wwwip1v6 "&subnetv6;:365::"> +<!ENTITY wwwip2 "&subnetIII;.102"> +<!ENTITY wwwip2v6 "&subnetv6;:366::"> +<!ENTITY ftpip "&subnetIII;.105"> +<!ENTITY ftpipv6 "&subnetv6;:369::"> +<!ENTITY mailip "&subnetIII;.108"> +<!ENTITY mailipv6 "&subnetv6;:36c::"> +<!ENTITY routerextipIII "&subnetIII;.2"> +<!ENTITY routerextipIIIv6 "&subnetv6;:302::"> +<!ENTITY fwextipIII "&subnetIII;.2"> +<!ENTITY fwextipIIIv6 "&subnetv6;:302::"> + +<!ENTITY routerintipIV "&subnetIV;.1"> +<!ENTITY routerintipIVv6 "&subnetv6;:401::"> +<!ENTITY routerextipIV "&subnetIV;.2"> +<!ENTITY routerextipIVv6 "&subnetv6;:402::"> +<!ENTITY fwextipIV "&subnetIV;.2"> +<!ENTITY fwextipIVv6 "&subnetv6;:402::"> +<!ENTITY fwintipIV "&subnetIV;.1"> +<!ENTITY fwintipIVv6 "&subnetv6;:401::"> + +<!ENTITY routerextipV "&subnetV;.2"> +<!ENTITY routerextipVv6 "&subnetv6;:502::"> +<!ENTITY fwextipV "&subnetV;.2"> +<!ENTITY fwextipVv6 "&subnetv6;:502::"> +<!ENTITY gateip "&subnetV;.1"> +<!ENTITY gateipv6 "&subnetv6;:501::"> + + +<!ENTITY wsIip "&subnetII;.100"> +<!ENTITY wsIipv6 "&subnetv6;:264::"> +<!ENTITY wsIIip "&subnetII;.101"> +<!ENTITY wsIIipv6 "&subnetv6;:265::"> +<!ENTITY wsIIIip "&subnetII;.102"> +<!ENTITY wsIIIipv6 "&subnetv6;:266::"> +<!ENTITY wsIVip "&subnetII;.103"> +<!ENTITY wsIVipv6 "&subnetv6;:267::"> + +<!ENTITY vpnclient1 "&subnetII;.110"> +<!ENTITY vpnclient2 "&subnetII;.111"> + + + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66595 - /trunk/autoinstallation/doc/examples/example.sysconfig.xml
by keichwa＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: keichwa Date: Wed Oct 26 12:52:49 2011 New Revision: 66595 URL: http://svn.opensuse.org/viewcvs/yast?rev=66595&view=rev Log: prepare building with daps and novdoc; copied from branches/tmp/ke/autoinstallation Modified: trunk/autoinstallation/doc/examples/example.sysconfig.xml Modified: trunk/autoinstallation/doc/examples/example.sysconfig.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/examples/ex… ============================================================================== --- trunk/autoinstallation/doc/examples/example.sysconfig.xml (original) +++ trunk/autoinstallation/doc/examples/example.sysconfig.xml Wed Oct 26 12:52:49 2011 @@ -5,7 +5,6 @@ <example> <title>Sysconfig Configuration</title> - <para> <screen> <![CDATA[ <sysconfig config:type="list" > @@ -27,7 +26,6 @@ </sysconfig> ]]> </screen> - </para> <para> Both relative and absolute pathes can be provided. If no absolute path is given, it is treated as a sysconfig file under the -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66594 - in /branches/SuSE-Code-11-SP2-Branch/audit-laf: VERSION package/yast2-audit-laf.changes
by gs＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: gs Date: Wed Oct 26 10:50:28 2011 New Revision: 66594 URL: http://svn.opensuse.org/viewcvs/yast?rev=66594&view=rev Log: reset version number to former version because package is not submitted for SP2 (only minor fixes) Modified: branches/SuSE-Code-11-SP2-Branch/audit-laf/VERSION branches/SuSE-Code-11-SP2-Branch/audit-laf/package/yast2-audit-laf.changes Modified: branches/SuSE-Code-11-SP2-Branch/audit-laf/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/audit… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/audit-laf/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/audit-laf/VERSION Wed Oct 26 10:50:28 2011 @@ -1 +1 @@ -2.17.11 +2.17.10 Modified: branches/SuSE-Code-11-SP2-Branch/audit-laf/package/yast2-audit-laf.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/audit… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/audit-laf/package/yast2-audit-laf.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/audit-laf/package/yast2-audit-laf.changes Wed Oct 26 10:50:28 2011 @@ -2,7 +2,6 @@ Thu Oct 6 14:54:51 CEST 2011 - gs(a)suse.de - Typos corrected in help text (bnc #702654) -- 2.17.11 ------------------------------------------------------------------- Tue Apr 13 08:45:17 CEST 2010 - gs(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66593 - /tags/stable-2_21_2/audit-laf/
by gs＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: gs Date: Wed Oct 26 10:33:33 2011 New Revision: 66593 URL: http://svn.opensuse.org/viewcvs/yast?rev=66593&view=rev Log: Created tag stable-2_21_2 for audit-laf Added: tags/stable-2_21_2/audit-laf/ - copied from r66592, trunk/audit-laf/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66592 - in /trunk/audit-laf: VERSION package/yast2-audit-laf.changes
by gs＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: gs Date: Wed Oct 26 10:31:22 2011 New Revision: 66592 URL: http://svn.opensuse.org/viewcvs/yast?rev=66592&view=rev Log: 2.21.2 Modified: trunk/audit-laf/VERSION trunk/audit-laf/package/yast2-audit-laf.changes Modified: trunk/audit-laf/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/VERSION?rev=66592&r1=6… ============================================================================== --- trunk/audit-laf/VERSION (original) +++ trunk/audit-laf/VERSION Wed Oct 26 10:31:22 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/audit-laf/package/yast2-audit-laf.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/package/yast2-audit-la… ============================================================================== --- trunk/audit-laf/package/yast2-audit-laf.changes (original) +++ trunk/audit-laf/package/yast2-audit-laf.changes Wed Oct 26 10:31:22 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 26 10:29:17 CEST 2011 - gs(a)suse.de + +- Fixed typos in help text (bnc #702654) +- 2.21.2 + +------------------------------------------------------------------- Tue Oct 4 10:12:29 UTC 2011 - cfarrell(a)suse.com - license update: GPL-2.0 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66591 - /trunk/audit-laf/src/helps.ycp
by gs＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: gs Date: Wed Oct 26 10:29:02 2011 New Revision: 66591 URL: http://svn.opensuse.org/viewcvs/yast?rev=66591&view=rev Log: fix typos in help text Modified: trunk/audit-laf/src/helps.ycp Modified: trunk/audit-laf/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/helps.ycp?rev=6659… ============================================================================== --- trunk/audit-laf/src/helps.ycp (original) +++ trunk/audit-laf/src/helps.ycp Wed Oct 26 10:29:02 2011 @@ -72,7 +72,7 @@ sends it) or <i>NOLOG</i> to discard all audit information instead of writing it on disk (does not affect data sent to the dispatcher).</p> ") + /* logfile_settings dialog help 5/8 */ - _("<p><b>Flush</b>: describes how to write the data to disk. If set to <i>INCREMANTAL</i> the + _("<p><b>Flush</b>: describes how to write the data to disk. If set to <i>INCREMENTAL</i> the <b>Frequency</b> parameter tells how many records to write before issuing an explicit flush to disk. <i>NONE</i> means: no special effort is made to flush data, <i>DATA</i>: keep data portion synced, <i>SYNC</i>: keep data and meta-data fully synced.</p>" ) + @@ -143,13 +143,13 @@ /* rules dialog help 1/6 */ "audit_rules" : _("<p><b><big>Rules for auditctl</big></b><br> -This dialog offers the possibiltiy to enable or to disable the syscall +This dialog offers the possibility to enable or to disable the syscall auditing as well as to lock the audit configuration. The selected flag from <b>Set Enabled Flag</b> will be added to the rules.</p>" ) + /* rules dialog help 2/6 */ _("<p><b>Please note:</b><br>Locking the rules means they cannot be changed until next reboot! </p>" ) + /* rules dialog help 3/6 */ - _("<p>Enabling auditing whithout additional rules will cause the + _("<p>Enabling auditing without additional rules will cause the applications which use <i>libaudit</i>, e.g. PAM to log to /var/log/audit/audit.log (default).</p> ") + /* rules dialog help 4/6 */ _("<p>The dialog also allows you to edit the rules manually, which is recommended for advanced users only.<br> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66590 - /branches/tmp/ke/autoinstallation/doc/ENV-autoyast
by keichwa＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: keichwa Date: Wed Oct 26 10:03:27 2011 New Revision: 66590 URL: http://svn.opensuse.org/viewcvs/yast?rev=66590&view=rev Log: novdoc adjustments Modified: branches/tmp/ke/autoinstallation/doc/ENV-autoyast Modified: branches/tmp/ke/autoinstallation/doc/ENV-autoyast URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/E… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/ENV-autoyast (original) +++ branches/tmp/ke/autoinstallation/doc/ENV-autoyast Wed Oct 26 10:03:27 2011 @@ -11,8 +11,8 @@ ROOTID="" PROFOS="" PROFARCH="" -DISTVER="" -PRODUCTNAME="" +DISTVER="11 SP2" +PRODUCTNAME="&sls;" PRODUCTNAMEREG="" # if you want to be able to source this file, so you do not have -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66589 - /branches/tmp/ke/autoinstallation/doc/xml/
by keichwa＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: keichwa Date: Wed Oct 26 10:03:07 2011 New Revision: 66589 URL: http://svn.opensuse.org/viewcvs/yast?rev=66589&view=rev Log: novdoc adjustments Added: branches/tmp/ke/autoinstallation/doc/xml/entity-decl.ent branches/tmp/ke/autoinstallation/doc/xml/network-decl.ent Modified: branches/tmp/ke/autoinstallation/doc/xml/BootMedia.xml branches/tmp/ke/autoinstallation/doc/xml/Installation.xml branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml branches/tmp/ke/autoinstallation/doc/xml/Makefile.am branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml branches/tmp/ke/autoinstallation/doc/xml/linuxrc.xml Modified: branches/tmp/ke/autoinstallation/doc/xml/BootMedia.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/BootMedia.xml (original) +++ branches/tmp/ke/autoinstallation/doc/xml/BootMedia.xml Wed Oct 26 10:03:07 2011 @@ -21,8 +21,8 @@ Floppies can be used to store the control file, especially when using the original &company-suse; CD-ROMs for a single, disconnected machine. Using the kernel command line, you can specify the location of the control - file on the floppy. (See <quote><link linkend='BootFromFloppy' - endterm="BootFromFloppy.title"></link></quote>) + file on the floppy. (See <quote><xref linkend='BootFromFloppy' + endterm="BootFromFloppy.title"></xref></quote>) </para> <para> Even without specifying any command line options, it is still possible to initiate the @@ -54,4 +54,4 @@ mode: xml sgml-parent-document: ("autoyast2.xml" "chapter" "section") End: - --> \ No newline at end of file + --> Modified: branches/tmp/ke/autoinstallation/doc/xml/Installation.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/Installation.xml (original) +++ branches/tmp/ke/autoinstallation/doc/xml/Installation.xml Wed Oct 26 10:03:07 2011 @@ -255,8 +255,8 @@ <para> The configuration file used by <command>linuxrc</command> can have the following keywords (for a detailed description of how linuxrc works and - other keywords, see <quote><link linkend='appendix.linuxrc' - endterm="appendix.linuxrc.title"></link></quote> ): + other keywords, see <quote><xref linkend='appendix.linuxrc' + endterm="appendix.linuxrc.title"></xref></quote> ): </para> <table frame='top'> @@ -335,8 +335,8 @@ </para> <para> The format of the special command line variable - <emphasis>autoyast</emphasis> can be used as described in table <quote><link - linkend="commandLineAutoYaST" endterm="commandLineAutoYaST.title"></link></quote> + <emphasis>autoyast</emphasis> can be used as described in table <quote><xref + linkend="commandLineAutoYaST" endterm="commandLineAutoYaST.title"></xref></quote> </para> <table frame='top' id="commandLineAutoYaST"> @@ -443,9 +443,9 @@ upon startup for a file named <filename>autoinst.xml</filename>. If such a file is found, YaST2 will switch into auto-installation mode even if no special - command line variables were supplied. (See <quote><link + command line variables were supplied. (See <quote><xref linkend="autoinstall.singlesystem" - endterm="autoinstall.singlesystem.title"></link></quote> ) + endterm="autoinstall.singlesystem.title"></xref></quote> ) </para> </listitem> <listitem> Modified: branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml (original) +++ branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml Wed Oct 26 10:03:07 2011 @@ -395,10 +395,12 @@ <tbody> <row> <entry>KDUMP_NOTIFICATION_TO</entry> - <entry>Exactly one email address (and only an address) to which the mail + <entry> + <para> + Exactly one email address (and only an address) to which the mail should be sent. Additional recipients can be specified in <literal>KDUMP_NOTIFICATION_CC</literal>. - <para><screen><KDUMP_NOTIFICATION_TO>bwalle(a)suse.de</KDUMP_NOTIFICATION_TO></screen></para></entry> + </para><screen><KDUMP_NOTIFICATION_TO>bwalle(a)suse.de</KDUMP_NOTIFICATION_TO></screen></entry> <entry>optional (email notification is disabled if empty)</entry> </row> <row> Modified: branches/tmp/ke/autoinstallation/doc/xml/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/Makefile.am (original) +++ branches/tmp/ke/autoinstallation/doc/xml/Makefile.am Wed Oct 26 10:03:07 2011 @@ -71,6 +71,9 @@ -e 's|</acronym>|</phrase>|g' \ -e 's|<caution>|<note>|g' \ -e 's|</caution>|</note>|g' \ + -e 's|<literallayout|<screen|g' \ + -e 's|</literallayout>|</screen>|g' \ + -e 's|<orderedlist numeration=\"arabic\">|<orderedlist>|g' \ -e 's|title id=[^>]*|title|' \ -e 's|endterm=[^/]*||' \ -e 's|frame=\"top\"||g' \ Modified: branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml (original) +++ branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml Wed Oct 26 10:03:07 2011 @@ -793,9 +793,9 @@ </figure> <para> - In this scenario and as shown in figure <quote><link + In this scenario and as shown in figure <quote><xref linkend='partitioning-keep1' - endterm="partitioning-keep1.title"/></quote> , &autoyast2; + endterm="partitioning-keep1.title"/></quote>, &autoyast2; should not in any case create any new partitions, instead it should search for certain partition types on the system and use them according to the partitioning plan in the control file. No Modified: branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml (original) +++ branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml Wed Oct 26 10:03:07 2011 @@ -205,7 +205,6 @@ <para> Here is an example for the use of a custom rules: </para> - <para> <screen> <![CDATA[ <rule> @@ -227,7 +226,6 @@ </rule> ]]> </screen> - </para> <para> The script in this rule can echo either "intel" or "non_intel" to STDOUT (the output of the grep command must be directed to /dev/null in this case). @@ -247,7 +245,7 @@ <para> you can have five different match_types: </para> - <para> + <itemizedlist> <listitem> <para> @@ -275,7 +273,7 @@ </para> </listitem> </itemizedlist> - </para> + <para> "greater" and "lower" can be used for memsize or totaldisk for example. They can match only on rules which return an integer value. @@ -295,7 +293,7 @@ You can do that with the "operator" element in the rules.xml file. Here is an example: </para> - <para> + <screen> <![CDATA[ <rule> @@ -315,7 +313,7 @@ </rule> ]]> </screen> - </para> + <para> Just "and" and "or" are possible operators and the default operator is "and". @@ -353,8 +351,7 @@ <para> If you are unsure about a value on your system, start an autoinstallation. If the proposal shows up, switch to the console via CTRL+ALT+F2 and run - <screen>/usr/lib/YaST2/bin/y2base ayast_probe ncurses - </screen>. It might help to to turn the confirmation on for this, so that + <command>/usr/lib/YaST2/bin/y2base ayast_probe ncurses</command>. It might help to to turn the confirmation on for this, so that the installation does not start in the background while you are watching the values. The textbox with the values is scrollable. </para> @@ -402,8 +399,8 @@ <row> <entry>mac</entry> <entry>MAC address of host</entry> - <entry>This attribute must always match exactly. (MAC addresses - to be matched should be in the form <emphasis>0080c8f6484c</emphasis></entry> + <entry><para>This attribute must always match exactly. (MAC addresses + to be matched should be in the form <emphasis>0080c8f6484c</emphasis></para></entry> </row> <row> <entry>linux</entry> @@ -504,48 +501,42 @@ <tbody> <row> <entry>dialog_nr</entry> - <entry>all rules with the same dialog_nr are presented on the same popup dialog so the same dialog_nr can appear in multiple rules. - <para><screen><dialog_nr config:type="integer">3</dialog_nr></screen></para> - </entry> + <entry><para>all rules with the same dialog_nr are presented on the same popup dialog so the same dialog_nr can appear in multiple rules. + </para><screen><dialog_nr config:type="integer">3</dialog_nr></screen></entry> <entry>This element is optional and the default for a missing dialog_nr is always "0". If you have one popup only anyway, you don't need to specify the dialog_nr</entry> </row> <row> <entry>element</entry> - <entry>each element needs a uniq id. Even if you have more than one dialog, you must not use the same id twice like an id "1" on dialog 1 and and id "1" on dialog 2. That's different than with <ask> dialogs, where you can have the same <element> id on multiple dialogs. - <para><screen><element config:type="integer">3</element></screen></para> - </entry> + <entry><para>each element needs a uniq id. Even if you have more than one dialog, you must not use the same id twice like an id "1" on dialog 1 and and id "1" on dialog 2. That's different than with <ask> dialogs, where you can have the same <element> id on multiple dialogs. + </para><screen><element config:type="integer">3</element></screen></entry> <entry>optional. If left out, autoyast adds his own id's internally but you can't use conflicts then (see below)</entry> </row> <row> <entry>title</entry> - <entry>the caption of the popup dialog - <para><screen><title>Desktop Selection</title></screen></para> - </entry> + <entry><para>the caption of the popup dialog + </para><screen><title>Desktop Selection</title></screen></entry> <entry>optional</entry> </row> <row> <entry>question</entry> - <entry>the question text is shown in the popup behind the checkbox. - <para><screen><question>KDE Desktop</question></screen></para> - </entry> + <entry><para>the question text is shown in the popup behind the checkbox. + </para><screen><question>KDE Desktop</question></screen></entry> <entry>optional. If you don't configure a text here, the name of the XML file that is triggered by this rule will be shown instead.</entry> </row> <row> <entry>timeout</entry> - <entry>a timeout in seconds after which the dialog will automatically "press" the okay button. Useful for a non blocking installation in combination with rules-dialogs. - <para><screen><timeout config:type="integer">30</timeout></screen></para> - </entry> + <entry><para>a timeout in seconds after which the dialog will automatically "press" the okay button. Useful for a non blocking installation in combination with rules-dialogs. + </para><screen><timeout config:type="integer">30</timeout></screen></entry> <entry>optional. A missing timeout will stop the installation process until the dialog is confirmed by the user.</entry> </row> <row> <entry>conflicts</entry> - <entry>a list of element id's (rules) that conflict with this rule. If this rule matches or is selected by the user, all conflicting rules are deselected and disabled in the popup. Take care that you don't create deadlocks. - <para><screen><conflicts config:type="list"> + <entry><para>a list of element id's (rules) that conflict with this rule. If this rule matches or is selected by the user, all conflicting rules are deselected and disabled in the popup. Take care that you don't create deadlocks. + </para><screen><conflicts config:type="list"> <element config:type="integer">1</element> <element config:type="integer">5</element> ... -</conflicts></screen></para> - </entry> +</conflicts></screen></entry> <entry>optional</entry> </row> </tbody> @@ -554,7 +545,6 @@ <para> Here is an example of how to use dialogs with rules: </para> - <para> <screen> <![CDATA[ <rules config:type="list"> @@ -617,7 +607,6 @@ </rules> ]]> </screen> - </para> </section> </section> @@ -635,7 +624,6 @@ <para> Here is an example of a class definition: </para> - <para> <screen> <![CDATA[ <classes config:type="list"> @@ -646,7 +634,6 @@ </classes> ]]> </screen> - </para> <para> The file Software.xml must be in the directory "classes/TrainingRoom/" then and it will get fetched from the same place like the autoyast profile and the rules were @@ -732,8 +719,8 @@ It is possible to mix rules and classes during an auto-installation session. For example you can identify a system using rules which contain class definitions in them. The process is described in the figures - <quote><link linkend='rulesflow' - endterm="rulesflow.title"></link></quote>. + <quote><xref linkend='rulesflow' + endterm="rulesflow.title"></xref></quote>. </para> <para> After retrieving the rules and merging them, the generated control file @@ -752,7 +739,6 @@ <para> Let's take a look at two XML parts that we want to merge: </para> - <para> <screen> <partitioning config:type="list"> <drive> @@ -774,8 +760,7 @@ </drive> </partitioning> </screen> - </para> - <para> + <screen> <partitioning config:type="list"> <drive> @@ -794,7 +779,7 @@ </drive> </partitioning> </screen> - </para> + <para> What you would expect is, that you'll end up in a profile with 3 partitions. That is not the case. You'll end up with two partitions and the first partition @@ -822,13 +807,13 @@ not official supported by autoyast and more a workaround than a nice solution. For each partition in one file, add an attribute to the partition like this: </para> - <para> + <screen> <partition dontmerge="1"> ... </partitions> </screen> - </para> + <para> The trick is, that the merge script will not detect the partitions as the same element type because of the new attribute. If you have more files, it might be needed to to add more attributes like <emphasis>dontmerge="2"</emphasis>. @@ -842,7 +827,7 @@ <para>you can use the <emphasis>dont_merge</emphasis> element in the rules or classes file like this: </para> - <para> + <screen> <classes config:type="list"> <class> @@ -854,8 +839,7 @@ </class> </classes> </screen> - </para> - <para> + <screen> <rule> <board_vendor> @@ -882,7 +866,7 @@ </result> </rule> </screen> - </para> + </section> </chapter> Added: branches/tmp/ke/autoinstallation/doc/xml/entity-decl.ent URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/entity-decl.ent (added) +++ branches/tmp/ke/autoinstallation/doc/xml/entity-decl.ent Wed Oct 26 10:03:07 2011 @@ -0,0 +1,251 @@ + + + + +<!ENTITY exampleuser "tux"> +<!ENTITY exampleuserII "wilber"> +<!ENTITY examplegroup "users"> + + + + + + +<!ENTITY exampledomainip "192.168.0"> +<!ENTITY exampledomain1ip "192.168.1"> +<!ENTITY exampledomain2ip "192.168.2"> + +<!ENTITY exampledomain2ipv6 "2002:c0a8:20a::"> +<!ENTITY exampleserver "sun"> +<!ENTITY exampleserverip "&exampledomainip;.20"> +<!ENTITY exampleserverfq "&exampleserver;.&exampledomain;"> +<!ENTITY exampleclient "earth"> +<!ENTITY exampleclientip "&exampledomainip;.1"> +<!ENTITY exampleclientfq "&exampleclient;.&exampledomain;"> +<!ENTITY exampleclientppp "ppp&exampleclient;"> +<!ENTITY exampleclientslip "sl&exampleclient;"> +<!ENTITY exampleclientuucp "uu&exampleclient;"> +<!ENTITY exampleclientII "venus"> +<!ENTITY exampleclientIIppp "ppp&exampleclientII;"> +<!ENTITY exampleclientIIslip "sl&exampleclientII;"> +<!ENTITY exampleclientIIuucp "uu&exampleclientII;"> + + +<!ENTITY rootuser '<systemitem class="username">root</systemitem>'> +<!ENTITY grub "GRUB"> + + +<!ENTITY lilo "LILO"> + +<!ENTITY sax "SaX2"> +<!ENTITY atomic-update "Atomic Update"> +<!ENTITY suse "SUSE"> +<!ENTITY novell "Novell"> +<!ENTITY suseconfig "SuSEconfig"> +<!ENTITY suselinux "&suse; Linux"> +<!ENTITY suseonsite "&suse; Studio Onsite"> +<!ENTITY suseonsitereg "&suseonsite;®"> + +<!ENTITY susestudio "&suse; Studio"> +<!ENTITY obs "&opensuse; Build Server"> +<!ENTITY xvendor "X.Org"> +<!ENTITY yast "YaST"> +<!ENTITY yastcc "&yast; Control Center"> +<!ENTITY gnomecc "GNOME Control Center"> +<!ENTITY ay "AutoYaST"> +<!ENTITY nm "NetworkManager"> +<!ENTITY fspot "f-spot"> +<!ENTITY digikam "digiKam"> +<!ENTITY yelp "Help"> +<!ENTITY khc "KDE help center"> +<!ENTITY umtsmon "UMTSmon"> + +<!ENTITY ooo "&libo;"> +<!ENTITY libo "LibreOffice"> +<!ENTITY aide "AIDE"> + + + + + +<!ENTITY deploy "Deployment Guide"> +<!ENTITY kdeuser "KDE User Guide"> +<!ENTITY gnomeuser "GNOME User Guide"> +<!ENTITY moblinuser "Moblin User Guide"> +<!ENTITY instquick "Installation Quick Start"> +<!ENTITY gnomequick "GNOME Quick Start"> +<!ENTITY kdequick "KDE Quick Start"> +<!ENTITY moblinquick "Moblin Quick Start"> +<!ENTITY oofficequick "&ooo; Quick Start"> +<!ENTITY apps "Application Guide"> +<!ENTITY admin "Administration Guide"> +<!ENTITY reference "Reference"> +<!ENTITY startup "Start-Up"> +<!ENTITY aaadmin "Novell AppArmor Administration Guide"> +<!ENTITY aaquick "Novell AppArmor Quick Start"> +<!ENTITY lfl "Lessons For Lizards"> +<!ENTITY storage "Storage Administration Guide"> +<!ENTITY haguide "High Availability Guide"> +<!ENTITY virtual "Virtualization Guide"> +<!ENTITY xenguide "Virtualization with &xen;"> +<!ENTITY kvmguide "Virtualization with &kvm;"> +<!ENTITY auditguide "The Linux Audit Framework"> +<!ENTITY auditquick "Linux Audit Quick Start"> +<!ENTITY tuning "System Analysis and Tuning Guide"> +<!ENTITY tuningsub "Problem Detection, Resolution, and Optimization"> +<!ENTITY secguide "Security Guide"> +<!ENTITY smtguide "Subscription Management Tool Guide"> +<!ENTITY webyastconfguide "WebYaST Configuration Guide"> +<!ENTITY studioadmin "Administration Guide"> +<!ENTITY studioinstall "Installation & Deployment Guide"> + + + + + + +<!ENTITY x86 "x86"> +<!ENTITY amd64 "AMD64"> +<!ENTITY s390 "S/390"> +<!ENTITY zseries "System z"> +<!ENTITY ipf "Itanium"> +<!ENTITY ipseries "POWER"> +<!ENTITY ppc "POWER"> +<!ENTITY em64t "Intel EM64T"> +<!ENTITY intel64 "Intel 64"> + + + + + + + + +<!ENTITY opensuse "openSUSE"> +<!ENTITY opensusereg "openSUSE®"> +<!ENTITY sle "SUSE Linux Enterprise"> +<!ENTITY sas "&sle; Advanced Server"> +<!ENTITY slereg "SUSE® Linux Enterprise"> +<!ENTITY slert "&sle; Real Time"> +<!ENTITY slerte "&slert; Extension"> +<!ENTITY slertreg "&slereg; Real Time"> +<!ENTITY slertereg "&slereg; Real Time Extension"> +<!ENTITY sls "SUSE Linux Enterprise Server"> +<!ENTITY slsa "SLES"> +<!ENTITY slsreg "SUSE® Linux Enterprise Server"> +<!ENTITY sled "SUSE Linux Enterprise Desktop"> +<!ENTITY sleda "SLED"> +<!ENTITY sledreg "SUSE® Linux Enterprise Desktop"> +<!ENTITY productname '<?suse name="productname"?>'> +<!ENTITY productnamereg '<?suse name="productnamereg"?>'> +<!ENTITY productnumber '<?suse name="productnumber"?>'> +<!ENTITY sdk "SUSE Software Development Kit"> +<!ENTITY slreg "SUSE® Linux"> +<!ENTITY slepos "SUSE Linux Enterprise Point of Service"> +<!ENTITY sleposreg "SUSE® Linux Enterprise Point of Service"> +<!ENTITY slert "&sle; Real Time"> +<!ENTITY slertreg "&slereg; Real Time"> +<!ENTITY hasi "High Availability Extension"> +<!ENTITY sletcreg "&slereg; Thin Client"> +<!ENTITY sletc "&sle; Thin Client"> +<!ENTITY sletca "SLETC"> +<!ENTITY tc "Thin Client"> +<!ENTITY nu "NU"> +<!ENTITY ncc "Novell Customer Center"> +<!ENTITY yup "yup"> +<!ENTITY imgcreat "Image Creator"> +<!ENTITY admserv "Administration Server"> +<!ENTITY branchserv "Branch Server"> +<!ENTITY imgserv "Image Building Server"> +<!ENTITY posbranchserv "POSBranch Server"> +<!ENTITY pos "Point of Service"> +<!ENTITY wy "WebYaST"> +<!ENTITY wyclient "&yast;2 Webclient"> +<!ENTITY wyservice "&yast;2 Webservice"> +<!ENTITY slms "SUSE Lifecycle Management Server"> +<!ENTITY slmsreg "SUSE® Lifecycle Management Server"> + + + + + +<!ENTITY musicplayer "Banshee"> +<!ENTITY musicplayerreg "Banshee™"> +<!ENTITY zenup "Software Updater"> +<!ENTITY updater "GNOME Update Applet/KDE Software Updater"> +<!ENTITY gupdater "Update Applet">  +<!ENTITY kupdater "Software Updater">  +<!ENTITY aa "AppArmor"> +<!ENTITY aareg "AppArmor®"> +<!ENTITY naa "Novell AppArmor"> +<!ENTITY naareg "Novell® AppArmor"> +<!ENTITY hb "Heartbeat"> +<!ENTITY hbvs "Heartbeat 2"> +<!ENTITY hbgui "Linux HA Management Client"> +<!ENTITY smtool "Subscription Management Tool"> +<!ENTITY smt "SMT"> +<!ENTITY xen "Xen"> +<!ENTITY xenreg "Xen®"> +<!ENTITY kvm "KVM"> +<!ENTITY vmhost "VM Host Server"> +<!ENTITY vmguest "VM Guest"> +<!ENTITY dom0 "Domain0"> +<!ENTITY libvirt '<systemitem class="library">libvirt</systemitem>'> +<!ENTITY libvirtd '<systemitem class="daemon">libvirtd</systemitem>'> +<!ENTITY vmm "Virtual Machine Manager"> +<!ENTITY qemu "QEMU"> +<!ENTITY pk "PolicyKit"> +<!ENTITY ha "High Availability"> +<!ENTITY ais "OpenAIS"> +<!ENTITY stonith "STONITH"> +<!ENTITY susefirewall "SuSEFirewall2"> +<!ENTITY pciback "PCI Pass-Through"> +<!ENTITY lvs "Linux Virtual Server"> +<!ENTITY krandr "KRandRTray"> +<!ENTITY amarok "Amarok"> +<!ENTITY digikam "digiKam"> +<!ENTITY postgresql "PostgreSQL"> +<!ENTITY mysql "MySQL"> +<!ENTITY jeos "JeOS"> +<!ENTITY stap "SystemTap"> +<!ENTITY oprof "OProfile"> +<!ENTITY cpufreq "CPUfreq"> +<!ENTITY powertop "powerTOP"> + + +<!ENTITY thrdmrk "*"> + + + + + +<!ENTITY ycc_runlevel "System Services (Runlevel)"> + + + + +<!ENTITY kiwi "KIWI"> +<!ENTITY cdcreator "CD Creator"> +<!ENTITY addoncreator "Add-on Creator"> +<!ENTITY imgcreator "Image Creator"> +<!ENTITY productcreator "Product Creator"> +<!ENTITY nomad "Nomad"> +<!ENTITY cpufreq "CPUfreq"> +<!ENTITY altf2 '<keycombo><keycap function="alt"/><keycap>F2</keycap></keycombo>'> + +<!ENTITY wypublic "/srv/www/yast/public/"> +<!ENTITY mac "<replaceable>MAC</replaceable>"> +<!ENTITY hwmac "hwtype.<replaceable>MAC</replaceable>"> +<!ENTITY confmac "config.<replaceable>MAC</replaceable>"> + + + +<!ENTITY euro "€"> + + +<!ENTITY % network-entities SYSTEM "network-decl.ent"> +%network-entities; + + + + Modified: branches/tmp/ke/autoinstallation/doc/xml/linuxrc.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/linuxrc.xml (original) +++ branches/tmp/ke/autoinstallation/doc/xml/linuxrc.xml Wed Oct 26 10:03:07 2011 @@ -35,7 +35,6 @@ kernel parameter that accidentally is recognized by Linuxrc, too), use <emphasis>linuxrc=nocmdline</emphasis>. </para> - <para> <note> <title>Change starting from SUSE Linux 10.2</title> <para> @@ -43,7 +42,6 @@ explicit, like 'info=floppy:/info'. </para> </note> - </para> <para> Independent of the above, Linuxrc will always look for and parse a file <filename>/linuxrc.config</filename>. You can use this file to change default @@ -57,17 +55,16 @@ <title>'info' file format</title> <para> Lines starting with '<emphasis>#</emphasis>' are comments, valid entries are of the form + </para> <screen> key: value - </screen> + </screen><para> Note that <emphasis>value</emphasis> extends to the end of the line and so may contain spaces. <emphasis>key</emphasis> is matched case insensitive. </para> <para> You can use the same key - value pairs on the kernel command line using the syntax - <interface> - key=value - </interface> + <literal>key=value</literal>. Lines that don't have the form described above are ignored. </para> <para> Added: branches/tmp/ke/autoinstallation/doc/xml/network-decl.ent URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x… ============================================================================== --- branches/tmp/ke/autoinstallation/doc/xml/network-decl.ent (added) +++ branches/tmp/ke/autoinstallation/doc/xml/network-decl.ent Wed Oct 26 10:03:07 2011 @@ -0,0 +1,182 @@ + + + + + +<!ENTITY exampledomain "example.com"> +<!ENTITY exampledomain1 "example.net"> +<!ENTITY exampledomain2 "example.org"> + + +<!ENTITY subnetI "192.168.1"> +<!ENTITY subnetImask "&subnetI;.0/24"> +<!ENTITY subnetII "192.168.2"> +<!ENTITY subnetIImask "&subnetII;.0/24"> +<!ENTITY subnetIII "192.168.3"> +<!ENTITY subnetIIImask "&subnetIII;.0/24"> +<!ENTITY subnetIV "192.168.4"> +<!ENTITY subnetIVmask "&subnetIV;.0/24"> +<!ENTITY subnetV "192.168.5"> +<!ENTITY subnetVmask "&subnetV;.0/30"> +<!ENTITY subnetnat "192.168.100"> +<!ENTITY subnetnatmask "&subnetnat;.0/24"> + +<!ENTITY subnetv6 "2002:c0a8"> + + +<!ENTITY subnetIbc "&subnetI;.255"> +<!ENTITY subnetIIbc "&subnetII;.255"> +<!ENTITY subnetIIIbc "&subnetIII;.255"> +<!ENTITY subnetIVbc "&subnetIV;.255"> +<!ENTITY subnetVbc "&subnetV;.252"> + + +<!ENTITY subnetmask "255.255.255.0"> + + +<!ENTITY smbname "smb.&exampledomain;"> +<!ENTITY nfsname "nfs.&exampledomain;"> +<!ENTITY iscsiname "iscsi.&exampledomain;"> +<!ENTITY proxyname "www-proxy.&exampledomain;"> +<!ENTITY ldapname "ldap.&exampledomain;"> +<!ENTITY nisname "nis.&exampledomain;"> +<!ENTITY slpname "slp.&exampledomain;"> +<!ENTITY ntpname "ntp.&exampledomain;"> +<!ENTITY tftpname "tftp.&exampledomain;"> +<!ENTITY pxename "pxe.&exampledomain;"> +<!ENTITY kdcname "kdc.&exampledomain;"> +<!ENTITY dnsname "dns.&exampledomain;"> +<!ENTITY dhcpname "dhcp.&exampledomain;"> +<!ENTITY cupsname "cups.&exampledomain;"> + + +<!ENTITY wwwname "www.&exampledomain;"> +<!ENTITY wwwname1 "www.&exampledomain1;"> +<!ENTITY wwwname2 "www.&exampledomain2;"> +<!ENTITY ftpname "ftp.&exampledomain;"> +<!ENTITY mailname "mail.&exampledomain;"> +<!ENTITY routerextname "routerext.&exampledomain;"> +<!ENTITY routerintname "routerint.&exampledomain;"> +<!ENTITY fwextname "fwext.&exampledomain;"> +<!ENTITY fwintname "fwint.&exampledomain;"> +<!ENTITY gatename "gate.&exampledomain;"> + + +<!ENTITY wsIname "jupiter.&exampledomain;"> +<!ENTITY wsIIname "venus.&exampledomain;"> +<!ENTITY wsIIIname "saturn.&exampledomain;"> +<!ENTITY wsIVname "mercury.&exampledomain;"> + + +<!ENTITY wsI "jupiter"> +<!ENTITY wsII "venus"> +<!ENTITY wsIII "saturn"> +<!ENTITY wsIV "mercury"> + + +<!ENTITY xenhostname "earth.&exampledomain;"> +<!ENTITY xenhost "earth"> +<!ENTITY xenhostip "&subnetI;.20"> +<!ENTITY xenguestname "alice.&exampledomain;"> +<!ENTITY xenguest "alice"> +<!ENTITY xenguestip "&subnetI;.21"> +<!ENTITY xennatguest "dolly"> +<!ENTITY xennatip "&subnetnat;.1"> + + + +<!ENTITY wsImac "00:30:6E:08:EC:80"> +<!ENTITY wsIImac "00:00:1C:B5:A4:32"> +<!ENTITY wsIIImac "00:17:31:CA:A3:4A"> +<!ENTITY wsIVmac "00:16:35:AF:94:4B"> + + +<!ENTITY smbip "&subnetI;.110"> +<!ENTITY smbipv6 "&subnetv6;:16e::"> +<!ENTITY nfsip "&subnetI;.110"> +<!ENTITY nfsipv6 "&subnetv6;:16e::"> +<!ENTITY iscsiip "&subnetI;.111"> +<!ENTITY iscsiipv6 "&subnetv6;:16f::"> +<!ENTITY proxyip "&subnetI;.112"> +<!ENTITY proxyipv6 "&subnetv6;170::"> +<!ENTITY ldapip "&subnetI;.113"> +<!ENTITY ldapipv6 "&subnetv6;:171::"> +<!ENTITY nisip "&subnetI;.113"> +<!ENTITY nisipv6 "&subnetv6;:171::"> +<!ENTITY ntpip "&subnetI;.116"> +<!ENTITY ntpipv6 "&subnetv6:174::;"> +<!ENTITY tftpip "&subnetI;.115"> +<!ENTITY tftpipv6 "&subnetv6;:173::"> +<!ENTITY pxeip "&subnetI;.115"> +<!ENTITY pxeipv6 "&subnetv6;:173::"> +<!ENTITY kdcip "&subnetI;.114"> +<!ENTITY kdcipv6 "&subnetv6;:172::"> +<!ENTITY dnsip "&subnetI;.116"> +<!ENTITY dnsipv6 "&subnetv6;:174::"> +<!ENTITY vpnip "&subnetI;.120"> + + +<!ENTITY slpip "&subnetII;.254"> +<!ENTITY slpipv6 "&subnetv6;:2fe::"> +<!ENTITY dhcpip "&subnetII;.254"> +<!ENTITY dhcpipv6 "&subnetv6;:2fe::"> +<!ENTITY cupsip "&subnetII;.253"> +<!ENTITY cupsipv6 "&subnetv6;:2fd::"> + + +<!ENTITY routerintipI "&subnetI;.1"> +<!ENTITY routerintipIv6 "&subnetv6;:101::"> +<!ENTITY fwintipI "&subnetI;.1"> +<!ENTITY fwintipIv6 "&subnetv6;:101::"> + +<!ENTITY routerintipII "&subnetII;.1"> +<!ENTITY routerintipIIv6 "&subnetv6;:201::"> +<!ENTITY fwintipII "&subnetII;.1"> +<!ENTITY fwintipIIv6 "&subnetv6;:201::"> + +<!ENTITY wwwip "&subnetIII;.100"> +<!ENTITY wwwipv6 "&subnetv6;:364::"> +<!ENTITY wwwip1 "&subnetIII;.101"> +<!ENTITY wwwip1v6 "&subnetv6;:365::"> +<!ENTITY wwwip2 "&subnetIII;.102"> +<!ENTITY wwwip2v6 "&subnetv6;:366::"> +<!ENTITY ftpip "&subnetIII;.105"> +<!ENTITY ftpipv6 "&subnetv6;:369::"> +<!ENTITY mailip "&subnetIII;.108"> +<!ENTITY mailipv6 "&subnetv6;:36c::"> +<!ENTITY routerextipIII "&subnetIII;.2"> +<!ENTITY routerextipIIIv6 "&subnetv6;:302::"> +<!ENTITY fwextipIII "&subnetIII;.2"> +<!ENTITY fwextipIIIv6 "&subnetv6;:302::"> + +<!ENTITY routerintipIV "&subnetIV;.1"> +<!ENTITY routerintipIVv6 "&subnetv6;:401::"> +<!ENTITY routerextipIV "&subnetIV;.2"> +<!ENTITY routerextipIVv6 "&subnetv6;:402::"> +<!ENTITY fwextipIV "&subnetIV;.2"> +<!ENTITY fwextipIVv6 "&subnetv6;:402::"> +<!ENTITY fwintipIV "&subnetIV;.1"> +<!ENTITY fwintipIVv6 "&subnetv6;:401::"> + +<!ENTITY routerextipV "&subnetV;.2"> +<!ENTITY routerextipVv6 "&subnetv6;:502::"> +<!ENTITY fwextipV "&subnetV;.2"> +<!ENTITY fwextipVv6 "&subnetv6;:502::"> +<!ENTITY gateip "&subnetV;.1"> +<!ENTITY gateipv6 "&subnetv6;:501::"> + + +<!ENTITY wsIip "&subnetII;.100"> +<!ENTITY wsIipv6 "&subnetv6;:264::"> +<!ENTITY wsIIip "&subnetII;.101"> +<!ENTITY wsIIipv6 "&subnetv6;:265::"> +<!ENTITY wsIIIip "&subnetII;.102"> +<!ENTITY wsIIIipv6 "&subnetv6;:266::"> +<!ENTITY wsIVip "&subnetII;.103"> +<!ENTITY wsIVipv6 "&subnetv6;:267::"> + +<!ENTITY vpnclient1 "&subnetII;.110"> +<!ENTITY vpnclient2 "&subnetII;.111"> + + + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66588 - in /branches/SuSE-Code-11-SP2-Branch/mail: package/yast2-mail.changes src/mail-server_dialogs.ycp
by varkoly＠svn2.opensuse.org 26 Oct '11

26 Oct '11

Author: varkoly Date: Wed Oct 26 09:36:47 2011 New Revision: 66588 URL: http://svn.opensuse.org/viewcvs/yast?rev=66588&view=rev Log: bnc#723742 - SLES11_SP2_LOC : The 'No Outgoing Mail' radio button can't check in Mail server global settings panel Modified: branches/SuSE-Code-11-SP2-Branch/mail/package/yast2-mail.changes branches/SuSE-Code-11-SP2-Branch/mail/src/mail-server_dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/mail/package/yast2-mail.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/mail/package/yast2-mail.changes Wed Oct 26 09:36:47 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 26 07:35:35 UTC 2011 - varkoly(a)suse.com + +- bnc#723742 - SLES11_SP2_LOC : The 'No Outgoing Mail' radio button can't check in Mail server global settings panel! + +------------------------------------------------------------------- Tue Jul 26 15:07:45 UTC 2011 - varkoly(a)novell.com - bnc#708283 - yast2-mail fails with TLS error when writing LDAP Settings Modified: branches/SuSE-Code-11-SP2-Branch/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/mail/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/mail/src/mail-server_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/mail/src/mail-server_dialogs.ycp Wed Oct 26 09:36:47 2011 @@ -1378,7 +1378,7 @@ { SMT = "NONE"; } - MailServer::GlobalSettings["SendingMail","Type"] = UI::QueryWidget(`id(`SendingMailType), `CurrentButton); + MailServer::GlobalSettings["SendingMail","Type"] = SMT; MailServer::GlobalSettings["SendingMail","TLS"] = UI::QueryWidget(`id(`SendingMailTLS), `CurrentButton); MailServer::GlobalSettings["SendingMail","RelayHost","Name"] = ""; MailServer::GlobalSettings["SendingMail","RelayHost","Auth"] = "0"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0