Skip to content

Commit

Permalink
Merge 609e6b9 into 640ea5b
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Jan 3, 2019
2 parents 640ea5b + 609e6b9 commit 5130f3e
Show file tree
Hide file tree
Showing 18 changed files with 2 additions and 904 deletions.
103 changes: 1 addition & 102 deletions doc/control-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ Example snippet for no\_default:
```

They were requested in FATE#317481 and they are an evolution of the earlier
concept of Server Scenarios used in SLE 11.
concept of Server Scenarios used in SLE 11. The server scenarios were dropped.

Example:

Expand Down Expand Up @@ -807,107 +807,6 @@ section, identified by a matching *id* element. The contents of *partitioning*,
The *services* part currently only supports enabling additional services which
is done by specifying *service* with its *name* as seen in the example.

### System Scenarios

System scenarios contain the definition of the *inst\_scenarios* dialog in the
first stage installation. It offers several base scenarios, but only one
of them can be selected.

Example of configured scenarios:

```xml
<productDefines xmlns="http://www.suse.com/1.0/yast2ns"
xmlns:config="http://www.suse.com/1.0/configns">
<software>

<!-- list of supported scenarios -->
<system_scenarios config:type="list">

<!-- one scenario -->
<system_scenario>
<!-- 'id' matches the text 'scenario_game_server' -->
<id>scenario_game_server</id>
<!-- space-separated list of patterns -->
<patterns>game_server-pattern high-load-server</patterns>
<!-- plain icon filename (from the 32x32 directory) without suffix -->
<icon>yast-system</icon>
</system_scenario>

<system_scenario>
<id>scenario_web_server</id>
<patterns>web_server-pattern</patterns>
<icon>yast-http-server</icon>
</system_scenario>

<system_scenario>
<id>scenario_nfs_server</id>
<patterns>nfs_server-pattern</patterns>
<icon>yast-nfs-server</icon>
</system_scenario>

</system_scenarios>

<!-- this scenario (id) is selected by default -->
<default_system_scenario>scenario_nfs_server</default_system_scenario>

</software>

<texts>

<!-- dialog caption -->
<scenarios_caption><label>Server Base Scenario</label></scenarios_caption>
<!-- informative text between caption and listed scenarios -->
<scenarios_text><label>SUSE Linux Enterprise Server offers several base scenarios.
Choose the one that matches your server the best.</label></scenarios_text>

<!-- matches the 'id' of one 'system_scenario' -->
<scenario_game_server><label>Game Server</label></scenario_game_server>
<scenario_web_server><label>Web Server</label></scenario_web_server>
<scenario_nfs_server><label>NFS Server</label></scenario_nfs_server>

</texts>
</productDefines>
```

System scenarios are defined in the *software* section. The
*system\_scenarios* section consists of several *system\_scenario* definitions.
Each *system\_scenario* consists of:

- *id* - unique identificator of a selection.

- *patterns* - space-separated list of patterns covering the software
scenario.

- *icon* - plain icon filename (from the 32x32 theme directory) without
suffix.

Selection labels must be defined in the [texts](#control_texts) section.
Scenarios *id*s are used as link identificators.

```xml
<software>
<system_scenario>
<id></id>
</system_scenario>
</software>

<texts>
<><label>Some Label</label></>
</texts>
```

The *software* section can also contain an optional *default\_system\_scenario*
that defines the id of the default scenario.

There are some important texts that have to be defined for the dialog
layout:

- *scenarios\_caption* - used as a dialog caption for the "scenarios"
dialog.

- *scenarios\_text* - used as an informative text describing the
available selections below.

### Partitioning

> **Note:** this section describes the format implemented by yast2-storage
Expand Down
5 changes: 0 additions & 5 deletions package/yast2-installation.spec
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,8 @@ systemctl enable YaST2-Firstboot.service
%{yast_libdir}/transfer

# agents
%{yast_scrconfdir}/etc_passwd.scr
%{yast_scrconfdir}/cfg_boot.scr
%{yast_scrconfdir}/cfg_windowmanager.scr
%{yast_scrconfdir}/cfg_fam.scr
%{yast_scrconfdir}/etc_install_inf.scr
%{yast_scrconfdir}/etc_install_inf_alias.scr
%{yast_scrconfdir}/etc_install_inf_options.scr
%{yast_scrconfdir}/run_df.scr
# fillup
%{_fillupdir}/sysconfig.security-checksig
Expand Down
2 changes: 0 additions & 2 deletions src/clients/inst_ask_online_update.rb

This file was deleted.

2 changes: 0 additions & 2 deletions src/clients/inst_check_autoinst_mode.rb

This file was deleted.

2 changes: 0 additions & 2 deletions src/clients/inst_scenarios.rb

This file was deleted.

2 changes: 0 additions & 2 deletions src/clients/update_wizard_steps.rb

This file was deleted.

160 changes: 0 additions & 160 deletions src/lib/installation/clients/inst_ask_online_update.rb

This file was deleted.

77 changes: 0 additions & 77 deletions src/lib/installation/clients/inst_check_autoinst_mode.rb

This file was deleted.

Loading

0 comments on commit 5130f3e

Please sign in to comment.