Hello community,
here is the log from the commit of package yast2-installation-control for
openSUSE:Factory checked in at 2018-01-17 21:42:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation-control (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation-control.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation-control"
Wed Jan 17 21:42:39 2018 rev:16 rq:556885 version:4.0.8
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-installation-control/yast2-installation-control.changes
2017-09-12 20:12:40.505292268 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation-control.new/yast2-installation-control.changes
2018-01-17 21:42:40.475118065 +0100
@@ -1,0 +2,61 @@
+Wed Dec 13 16:05:33 UTC 2017 - [email protected]
+
+- drop copy_to_system element (FATE#320873)
+- 4.0.8
+
+-------------------------------------------------------------------
+Wed Oct 25 11:41:06 CEST 2017 - [email protected]
+
+- fix typo in control.rnc
+- release 4.0.7
+
+-------------------------------------------------------------------
+Tue Oct 17 14:18:34 UTC 2017 - [email protected]
+
+- add fallback_for_desired_size to ng partitioning (fate#318196)
+- 4.0.6
+
+-------------------------------------------------------------------
+Tue Oct 17 09:53:22 UTC 2017 - [email protected]
+
+- adjust control.rnc for storage-ng (fate#318196)
+- 4.0.5
+
+-------------------------------------------------------------------
+Mon Oct 16 08:49:33 UTC 2017 - [email protected]
+
+- extend system role capabilities to redefine also globals,
+ network, proposals and modules to clone (bsc#1063216)
+- 4.0.4
+
+
+-------------------------------------------------------------------
+Wed Oct 11 11:05:19 UTC 2017 - [email protected]
+
+- add snapshots_percentage element and make it mutually exclusive
+ with snapshots_size
+- 4.0.3
+
+-------------------------------------------------------------------
+Tue Oct 10 13:45:06 UTC 2017 - [email protected]
+
+- update control.xml specification to include the new storage-ng
+ partitioning data
+- do no longer allow more than one partitioning element
+- 4.0.2
+
+-------------------------------------------------------------------
+Tue Oct 10 10:29:07 UTC 2017 - [email protected]
+
+- add "self_update_id" to allow defining an ID for self update SCC
+ query (bsc#1055556)
+- 4.0.1
+
+-------------------------------------------------------------------
+Wed Sep 20 13:55:59 UTC 2017 - [email protected]
+
+- Add order element to system roles to allow easier inserting of
+ roles from add ons (bsc#1049297)
+- 4.0.0
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-control-3.3.0.tar.bz2
New:
----
yast2-installation-control-4.0.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation-control.spec ++++++
--- /var/tmp/diff_new_pack.GVsMmr/_old 2018-01-17 21:42:41.187084739 +0100
+++ /var/tmp/diff_new_pack.GVsMmr/_new 2018-01-17 21:42:41.191084552 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation-control
-Version: 3.3.0
+Version: 4.0.8
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-control-3.3.0.tar.bz2 ->
yast2-installation-control-4.0.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-control-3.3.0/control/control.rnc
new/yast2-installation-control-4.0.8/control/control.rnc
--- old/yast2-installation-control-3.3.0/control/control.rnc 2017-08-22
12:09:17.498092272 +0200
+++ new/yast2-installation-control-4.0.8/control/control.rnc 2017-12-14
09:14:01.000000000 +0100
@@ -27,13 +27,28 @@
SYMBOL =
(
- attribute config:type { "symbol" },
- text
+ attribute config:type { "symbol" }
)
LIST =
attribute config:type { "list" }
+DISKSIZE =
+ (
+ attribute config:type { "disksize" },
+ (
+ "unlimited"
+ | list {
+ xsd:integer,
+ (
+ "B"
+ | "KiB" | "MiB" | "GiB" | "TiB" | "PiB" | "EiB" | "ZiB" | "YiB"
+ | "KB" | "MB" | "GB" | "TB" | "PB" | "EB" | "ZB" | "YB"
+ )
+ }
+ )
+ )
+
ANY =
(
BOOLEAN | INTEGER | SYMBOL | LIST | text
@@ -82,7 +97,6 @@
| rle_offer_rulevel_4
| default_ntp_setup
| save_instsys_content
- | copy_to_system
| displaymanager_shutdown
| enable_kdump
| polkit_default_privs
@@ -99,6 +113,7 @@
| debug_deploying
| show_drivers_info
| self_update_url
+ | self_update_id
## Default kernel parameters proposed by bootloader
additional_kernel_parameters = element additional_kernel_parameters {
text }
@@ -185,8 +200,15 @@
enable_kdump = element enable_kdump { BOOLEAN }
require_registration = element require_registration { BOOLEAN }
show_drivers_info = element show_drivers_info { BOOLEAN }
-# Self-update (FATE#319716).
+# Self-update URL (FATE#319716).
+## How it works?
+## here are two related keys for self update - URL and ID.
+## The ID is used to ask SCC for update URL.
+## The URL is used as fallback when SCC query failed.
self_update_url = element self_update_url { text }
+# Self-update id (bsc#1055556).
+## It is an ID used to query SCC for the self update repo.
+self_update_id = element self_update_id { text }
## Defines which pieces of installation system should be copied to
## the installed system before rebooting to second stage.
@@ -202,22 +224,6 @@
}+
}
-copy_to_system = element copy_to_system {
- LIST,
- element copy_to_system_item {
- element id { text } &
- element copy_to_dir { text } &
- element mandatory_files {
- LIST,
- element file_item { text }+
- }+ &
- element optional_files {
- LIST,
- element file_item { text }+
- }*
- }+
-}
-
services_proposal = element services_proposal {
LIST,
element service {
@@ -287,7 +293,7 @@
## Whether it is allowed to delete a package during upgrade
## *obsolete* without replacement
delete_old_packages = element delete_old_packages { BOOLEAN }
-selection_type = element selection_type { SYMBOL }
+selection_type = element selection_type { SYMBOL, text }
## System scenario selected by default.
## Used in inst_scenarios client.
default_system_scenario = element default_system_scenario { text }
@@ -446,7 +452,18 @@
# partitioning
-partitioning_elements =
+# An overview of partitioning related settings can be found in
+#
https://github.com/yast/yast-storage-ng/blob/master/doc/old_and_new_proposal.md
+
+# ng: one proposal and one volume list
+ng_partitioning_elements =
+ partitioning_proposal
+ & partitioning_volumes
+ & expert_partitioner_warning?
+ & use_separate_multipath_module?
+
+# legacy: the old stuff, mixed together
+legacy_partitioning_elements =
try_separate_home
| limit_try_home
| home_path
@@ -470,6 +487,12 @@
| root_subvolume_read_only
| subvolumes
+# you can either have the new 'ng' style elements or the old 'legacy' ones
+partitioning_elements =
+ ng_partitioning_elements | legacy_partitioning_elements*
+
+# legacy element definitions
+
try_separate_home = element try_separate_home { BOOLEAN }
limit_try_home = element limit_try_home { text }
home_path = element home_path { text }
@@ -525,9 +548,94 @@
}*
}
+# ng element definitions
+
+partitioning_proposal = element proposal { partitioning_proposal_elements }
+
+partitioning_proposal_elements =
+ ng_lvm?
+ & ng_resize_windows?
+ & ng_windows_delete_mode?
+ & ng_linux_delete_mode?
+ & ng_other_delete_mode?
+ & ng_lvm_vg_strategy?
+ & ng_lvm_vg_size?
+ & proposal_settings_editable?
+ & root_subvolume_read_only?
+
+ng_lvm = element lvm { BOOLEAN }
+ng_resize_windows = element resize_windows { BOOLEAN }
+ng_windows_delete_mode = element windows_delete_mode { SYMBOL,
ng_delete_mode_enum }
+ng_linux_delete_mode = element linux_delete_mode { SYMBOL, ng_delete_mode_enum
}
+ng_other_delete_mode = element other_delete_mode { SYMBOL, ng_delete_mode_enum
}
+ng_lvm_vg_strategy = element lvm_vg_strategy { SYMBOL, ng_lvm_vg_strategy_enum
}
+ng_lvm_vg_size = element lvm_vg_size { DISKSIZE }
+
+ng_delete_mode_enum = "none" | "ondemand" | "all"
+ng_lvm_vg_strategy_enum = "use_available" | "use_needed" | "use_vg_size"
+
+partitioning_volumes = element volumes {
+ LIST,
+ partitioning_volume+
+}
+
+partitioning_volume = element volume { partitioning_volume_elements }
+
+partitioning_volume_elements =
+ ng_mount_point?
+ & ng_proposed?
+ & ng_proposed_configurable?
+ & ng_fs_types?
+ & ng_fs_type?
+ & ng_desired_size?
+ & ng_min_size?
+ & ng_max_size?
+ & ng_max_size_lvm?
+ & ng_weight?
+ & ng_adjust_by_ram?
+ & ng_adjust_by_ram_configurable?
+ & ng_fallback_for_desired_size?
+ & ng_fallback_for_min_size?
+ & ng_fallback_for_max_size?
+ & ng_fallback_for_max_size_lvm?
+ & ng_fallback_for_weight?
+ & ng_snapshots?
+ & ng_snapshots_configurable?
+ & ng_snapshots_size_or_percentage?
+ & ng_subvolumes?
+ & ng_btrfs_default_subvolume?
+ & ng_disable_order?
+
+ng_snapshots_size_or_percentage = ng_snapshots_size | ng_snapshots_percentage
+
+ng_mount_point = element mount_point { text }
+ng_proposed = element proposed { BOOLEAN }
+ng_proposed_configurable = element proposed_configurable { BOOLEAN }
+ng_fs_types = element fs_types { text }
+ng_fs_type = element fs_type { text }
+ng_desired_size = element desired_size { DISKSIZE }
+ng_min_size = element min_size { DISKSIZE }
+ng_max_size = element max_size { DISKSIZE }
+ng_max_size_lvm = element max_size_lvm { DISKSIZE }
+ng_weight = element weight { INTEGER }
+ng_adjust_by_ram = element adjust_by_ram { BOOLEAN }
+ng_adjust_by_ram_configurable = element adjust_by_ram_configurable { BOOLEAN }
+ng_fallback_for_desired_size = element fallback_for_desired_size { text }
+ng_fallback_for_min_size = element fallback_for_min_size { text }
+ng_fallback_for_max_size = element fallback_for_max_size { text }
+ng_fallback_for_max_size_lvm = element fallback_for_max_size_lvm { text }
+ng_fallback_for_weight = element fallback_for_weight { text }
+ng_snapshots = element snapshots { BOOLEAN }
+ng_snapshots_configurable = element snapshots_configurable { BOOLEAN }
+ng_snapshots_size = element snapshots_size { DISKSIZE }
+ng_snapshots_percentage = element snapshots_percentage { INTEGER }
+ng_subvolumes = subvolumes
+ng_btrfs_default_subvolume = element btrfs_default_subvolume { text }
+ng_disable_order = element disable_order { INTEGER }
+
## Partitioning-related variables
partitioning = element partitioning {
- partitioning_elements*
+ partitioning_elements
}
# partitioning
@@ -566,9 +674,15 @@
## texts section: ${id} and ${id}_description.
element id { text } &
- ## option to not preselect any role, by default first one is preselected
+ ## option to not preselect any role, by default,
+ ## the first one (by sort order, see below) is preselected
+ ## Only the first (by sort order, see below) role should have this key,
others are ignored.
element no_default { BOOLEAN }? &
+ ## Option for order of role. Roles are sorted by order, the smaller first.
It can be negative.
+ ## If two roles have same order, then result is undefined, so try to avoid
it.
+ element order { INTEGER } &
+
## Role specific overrides for Partitioning
partitioning? &
@@ -579,10 +693,19 @@
element additional_dialogs { text }? &
## Additional services configuration for given role
- role_services?
+ role_services? &
+
+ ## Role specific overrides for Global
+ globals* &
+
+ ## Role specific overrides for Network
+ network* &
+
+ ## Role specific overrides for Proposals
+ proposals* &
- # 'globals? & network?' would also make sense here
- # but that has not been requested and tested.
+ ## Role specific overrides for Cloned modules
+ clone_modules*
}
role_services = element services {
@@ -919,22 +1042,23 @@
# update
+# not more than one partitioning element
productDefines_elements =
- textdomain
- | globals
- | software
- | partitioning
- | network
- | proposals
- | workflows
- | clone_modules
- | texts
- | inst_finish_stages
- | update
- | system_roles
+ textdomain*
+ & globals*
+ & software*
+ & partitioning?
+ & network*
+ & proposals*
+ & workflows*
+ & clone_modules*
+ & texts*
+ & inst_finish_stages*
+ & update*
+ & system_roles*
start = element productDefines {
- productDefines_elements*
+ productDefines_elements
}
debug_deploying = element debug_deploying { BOOLEAN }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-control-3.3.0/control/control.rng
new/yast2-installation-control-4.0.8/control/control.rng
--- old/yast2-installation-control-3.3.0/control/control.rng 2017-08-22
12:09:17.498092272 +0200
+++ new/yast2-installation-control-4.0.8/control/control.rng 2017-12-14
09:14:01.000000000 +0100
@@ -29,13 +29,42 @@
<attribute name="config:type">
<value>symbol</value>
</attribute>
- <text/>
</define>
<define name="LIST">
<attribute name="config:type">
<value>list</value>
</attribute>
</define>
+ <define name="DISKSIZE">
+ <attribute name="config:type">
+ <value>disksize</value>
+ </attribute>
+ <choice>
+ <value>unlimited</value>
+ <list>
+ <data type="integer"/>
+ <choice>
+ <value>B</value>
+ <value>KiB</value>
+ <value>MiB</value>
+ <value>GiB</value>
+ <value>TiB</value>
+ <value>PiB</value>
+ <value>EiB</value>
+ <value>ZiB</value>
+ <value>YiB</value>
+ <value>KB</value>
+ <value>MB</value>
+ <value>GB</value>
+ <value>TB</value>
+ <value>PB</value>
+ <value>EB</value>
+ <value>ZB</value>
+ <value>YB</value>
+ </choice>
+ </list>
+ </choice>
+ </define>
<define name="ANY">
<choice>
<ref name="BOOLEAN"/>
@@ -91,7 +120,6 @@
<ref name="rle_offer_rulevel_4"/>
<ref name="default_ntp_setup"/>
<ref name="save_instsys_content"/>
- <ref name="copy_to_system"/>
<ref name="displaymanager_shutdown"/>
<ref name="enable_kdump"/>
<ref name="polkit_default_privs"/>
@@ -108,6 +136,7 @@
<ref name="debug_deploying"/>
<ref name="show_drivers_info"/>
<ref name="self_update_url"/>
+ <ref name="self_update_id"/>
</choice>
</define>
<define name="additional_kernel_parameters">
@@ -361,12 +390,23 @@
<ref name="BOOLEAN"/>
</element>
</define>
- <!-- Self-update (FATE#319716). -->
+ <!-- Self-update URL (FATE#319716). -->
<define name="self_update_url">
+ <a:documentation>How it works?
+here are two related keys for self update - URL and ID.
+The ID is used to ask SCC for update URL.
+The URL is used as fallback when SCC query failed.</a:documentation>
<element name="self_update_url">
<text/>
</element>
</define>
+ <!-- Self-update id (bsc#1055556). -->
+ <define name="self_update_id">
+ <a:documentation>It is an ID used to query SCC for the self update
repo.</a:documentation>
+ <element name="self_update_id">
+ <text/>
+ </element>
+ </define>
<define name="save_instsys_content">
<a:documentation>Defines which pieces of installation system should be
copied to
the installed system before rebooting to second stage.</a:documentation>
@@ -390,43 +430,6 @@
</oneOrMore>
</element>
</define>
- <define name="copy_to_system">
- <element name="copy_to_system">
- <ref name="LIST"/>
- <oneOrMore>
- <element name="copy_to_system_item">
- <interleave>
- <element name="id">
- <text/>
- </element>
- <element name="copy_to_dir">
- <text/>
- </element>
- <oneOrMore>
- <element name="mandatory_files">
- <ref name="LIST"/>
- <oneOrMore>
- <element name="file_item">
- <text/>
- </element>
- </oneOrMore>
- </element>
- </oneOrMore>
- <zeroOrMore>
- <element name="optional_files">
- <ref name="LIST"/>
- <oneOrMore>
- <element name="file_item">
- <text/>
- </element>
- </oneOrMore>
- </element>
- </zeroOrMore>
- </interleave>
- </element>
- </oneOrMore>
- </element>
- </define>
<define name="services_proposal">
<element name="services_proposal">
<ref name="LIST"/>
@@ -548,6 +551,7 @@
<define name="selection_type">
<element name="selection_type">
<ref name="SYMBOL"/>
+ <text/>
</element>
</define>
<define name="default_system_scenario">
@@ -899,7 +903,25 @@
</define>
<!-- software -->
<!-- partitioning -->
- <define name="partitioning_elements">
+ <!--
+ An overview of partitioning related settings can be found in
+
https://github.com/yast/yast-storage-ng/blob/master/doc/old_and_new_proposal.md
+ -->
+ <!-- ng: one proposal and one volume list -->
+ <define name="ng_partitioning_elements">
+ <interleave>
+ <ref name="partitioning_proposal"/>
+ <ref name="partitioning_volumes"/>
+ <optional>
+ <ref name="expert_partitioner_warning"/>
+ </optional>
+ <optional>
+ <ref name="use_separate_multipath_module"/>
+ </optional>
+ </interleave>
+ </define>
+ <!-- legacy: the old stuff, mixed together -->
+ <define name="legacy_partitioning_elements">
<choice>
<ref name="try_separate_home"/>
<ref name="limit_try_home"/>
@@ -925,6 +947,16 @@
<ref name="subvolumes"/>
</choice>
</define>
+ <!-- you can either have the new 'ng' style elements or the old 'legacy'
ones -->
+ <define name="partitioning_elements">
+ <choice>
+ <ref name="ng_partitioning_elements"/>
+ <zeroOrMore>
+ <ref name="legacy_partitioning_elements"/>
+ </zeroOrMore>
+ </choice>
+ </define>
+ <!-- legacy element definitions -->
<define name="try_separate_home">
<element name="try_separate_home">
<ref name="BOOLEAN"/>
@@ -1090,12 +1122,310 @@
</zeroOrMore>
</element>
</define>
+ <!-- ng element definitions -->
+ <define name="partitioning_proposal">
+ <element name="proposal">
+ <ref name="partitioning_proposal_elements"/>
+ </element>
+ </define>
+ <define name="partitioning_proposal_elements">
+ <interleave>
+ <optional>
+ <ref name="ng_lvm"/>
+ </optional>
+ <optional>
+ <ref name="ng_resize_windows"/>
+ </optional>
+ <optional>
+ <ref name="ng_windows_delete_mode"/>
+ </optional>
+ <optional>
+ <ref name="ng_linux_delete_mode"/>
+ </optional>
+ <optional>
+ <ref name="ng_other_delete_mode"/>
+ </optional>
+ <optional>
+ <ref name="ng_lvm_vg_strategy"/>
+ </optional>
+ <optional>
+ <ref name="ng_lvm_vg_size"/>
+ </optional>
+ <optional>
+ <ref name="proposal_settings_editable"/>
+ </optional>
+ <optional>
+ <ref name="root_subvolume_read_only"/>
+ </optional>
+ </interleave>
+ </define>
+ <define name="ng_lvm">
+ <element name="lvm">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
+ <define name="ng_resize_windows">
+ <element name="resize_windows">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
+ <define name="ng_windows_delete_mode">
+ <element name="windows_delete_mode">
+ <ref name="SYMBOL"/>
+ <ref name="ng_delete_mode_enum"/>
+ </element>
+ </define>
+ <define name="ng_linux_delete_mode">
+ <element name="linux_delete_mode">
+ <ref name="SYMBOL"/>
+ <ref name="ng_delete_mode_enum"/>
+ </element>
+ </define>
+ <define name="ng_other_delete_mode">
+ <element name="other_delete_mode">
+ <ref name="SYMBOL"/>
+ <ref name="ng_delete_mode_enum"/>
+ </element>
+ </define>
+ <define name="ng_lvm_vg_strategy">
+ <element name="lvm_vg_strategy">
+ <ref name="SYMBOL"/>
+ <ref name="ng_lvm_vg_strategy_enum"/>
+ </element>
+ </define>
+ <define name="ng_lvm_vg_size">
+ <element name="lvm_vg_size">
+ <ref name="DISKSIZE"/>
+ </element>
+ </define>
+ <define name="ng_delete_mode_enum">
+ <choice>
+ <value>none</value>
+ <value>ondemand</value>
+ <value>all</value>
+ </choice>
+ </define>
+ <define name="ng_lvm_vg_strategy_enum">
+ <choice>
+ <value>use_available</value>
+ <value>use_needed</value>
+ <value>use_vg_size</value>
+ </choice>
+ </define>
+ <define name="partitioning_volumes">
+ <element name="volumes">
+ <ref name="LIST"/>
+ <oneOrMore>
+ <ref name="partitioning_volume"/>
+ </oneOrMore>
+ </element>
+ </define>
+ <define name="partitioning_volume">
+ <element name="volume">
+ <ref name="partitioning_volume_elements"/>
+ </element>
+ </define>
+ <define name="partitioning_volume_elements">
+ <interleave>
+ <optional>
+ <ref name="ng_mount_point"/>
+ </optional>
+ <optional>
+ <ref name="ng_proposed"/>
+ </optional>
+ <optional>
+ <ref name="ng_proposed_configurable"/>
+ </optional>
+ <optional>
+ <ref name="ng_fs_types"/>
+ </optional>
+ <optional>
+ <ref name="ng_fs_type"/>
+ </optional>
+ <optional>
+ <ref name="ng_desired_size"/>
+ </optional>
+ <optional>
+ <ref name="ng_min_size"/>
+ </optional>
+ <optional>
+ <ref name="ng_max_size"/>
+ </optional>
+ <optional>
+ <ref name="ng_max_size_lvm"/>
+ </optional>
+ <optional>
+ <ref name="ng_weight"/>
+ </optional>
+ <optional>
+ <ref name="ng_adjust_by_ram"/>
+ </optional>
+ <optional>
+ <ref name="ng_adjust_by_ram_configurable"/>
+ </optional>
+ <optional>
+ <ref name="ng_fallback_for_desired_size"/>
+ </optional>
+ <optional>
+ <ref name="ng_fallback_for_min_size"/>
+ </optional>
+ <optional>
+ <ref name="ng_fallback_for_max_size"/>
+ </optional>
+ <optional>
+ <ref name="ng_fallback_for_max_size_lvm"/>
+ </optional>
+ <optional>
+ <ref name="ng_fallback_for_weight"/>
+ </optional>
+ <optional>
+ <ref name="ng_snapshots"/>
+ </optional>
+ <optional>
+ <ref name="ng_snapshots_configurable"/>
+ </optional>
+ <optional>
+ <ref name="ng_snapshots_size_or_percentage"/>
+ </optional>
+ <optional>
+ <ref name="ng_subvolumes"/>
+ </optional>
+ <optional>
+ <ref name="ng_btrfs_default_subvolume"/>
+ </optional>
+ <optional>
+ <ref name="ng_disable_order"/>
+ </optional>
+ </interleave>
+ </define>
+ <define name="ng_snapshots_size_or_percentage">
+ <choice>
+ <ref name="ng_snapshots_size"/>
+ <ref name="ng_snapshots_percentage"/>
+ </choice>
+ </define>
+ <define name="ng_mount_point">
+ <element name="mount_point">
+ <text/>
+ </element>
+ </define>
+ <define name="ng_proposed">
+ <element name="proposed">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
+ <define name="ng_proposed_configurable">
+ <element name="proposed_configurable">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
+ <define name="ng_fs_types">
+ <element name="fs_types">
+ <text/>
+ </element>
+ </define>
+ <define name="ng_fs_type">
+ <element name="fs_type">
+ <text/>
+ </element>
+ </define>
+ <define name="ng_desired_size">
+ <element name="desired_size">
+ <ref name="DISKSIZE"/>
+ </element>
+ </define>
+ <define name="ng_min_size">
+ <element name="min_size">
+ <ref name="DISKSIZE"/>
+ </element>
+ </define>
+ <define name="ng_max_size">
+ <element name="max_size">
+ <ref name="DISKSIZE"/>
+ </element>
+ </define>
+ <define name="ng_max_size_lvm">
+ <element name="max_size_lvm">
+ <ref name="DISKSIZE"/>
+ </element>
+ </define>
+ <define name="ng_weight">
+ <element name="weight">
+ <ref name="INTEGER"/>
+ </element>
+ </define>
+ <define name="ng_adjust_by_ram">
+ <element name="adjust_by_ram">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
+ <define name="ng_adjust_by_ram_configurable">
+ <element name="adjust_by_ram_configurable">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
+ <define name="ng_fallback_for_desired_size">
+ <element name="fallback_for_desired_size">
+ <text/>
+ </element>
+ </define>
+ <define name="ng_fallback_for_min_size">
+ <element name="fallback_for_min_size">
+ <text/>
+ </element>
+ </define>
+ <define name="ng_fallback_for_max_size">
+ <element name="fallback_for_max_size">
+ <text/>
+ </element>
+ </define>
+ <define name="ng_fallback_for_max_size_lvm">
+ <element name="fallback_for_max_size_lvm">
+ <text/>
+ </element>
+ </define>
+ <define name="ng_fallback_for_weight">
+ <element name="fallback_for_weight">
+ <text/>
+ </element>
+ </define>
+ <define name="ng_snapshots">
+ <element name="snapshots">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
+ <define name="ng_snapshots_configurable">
+ <element name="snapshots_configurable">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
+ <define name="ng_snapshots_size">
+ <element name="snapshots_size">
+ <ref name="DISKSIZE"/>
+ </element>
+ </define>
+ <define name="ng_snapshots_percentage">
+ <element name="snapshots_percentage">
+ <ref name="INTEGER"/>
+ </element>
+ </define>
+ <define name="ng_subvolumes">
+ <ref name="subvolumes"/>
+ </define>
+ <define name="ng_btrfs_default_subvolume">
+ <element name="btrfs_default_subvolume">
+ <text/>
+ </element>
+ </define>
+ <define name="ng_disable_order">
+ <element name="disable_order">
+ <ref name="INTEGER"/>
+ </element>
+ </define>
<define name="partitioning">
<a:documentation>Partitioning-related variables</a:documentation>
<element name="partitioning">
- <zeroOrMore>
- <ref name="partitioning_elements"/>
- </zeroOrMore>
+ <ref name="partitioning_elements"/>
</element>
</define>
<!-- partitioning -->
@@ -1155,10 +1485,17 @@
</element>
<optional>
<element name="no_default">
- <a:documentation>option to not preselect any role, by default
first one is preselected</a:documentation>
+ <a:documentation>option to not preselect any role, by default,
+the first one (by sort order, see below) is preselected
+Only the first (by sort order, see below) role should have this key, others
are ignored.</a:documentation>
<ref name="BOOLEAN"/>
</element>
</optional>
+ <element name="order">
+ <a:documentation>Option for order of role. Roles are sorted by
order, the smaller first. It can be negative.
+If two roles have same order, then result is undefined, so try to avoid
it.</a:documentation>
+ <ref name="INTEGER"/>
+ </element>
<optional>
<ref name="partitioning">
<a:documentation>Role specific overrides for
Partitioning</a:documentation>
@@ -1180,11 +1517,27 @@
<a:documentation>Additional services configuration for given
role</a:documentation>
</ref>
</optional>
+ <zeroOrMore>
+ <ref name="globals">
+ <a:documentation>Role specific overrides for
Global</a:documentation>
+ </ref>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="network">
+ <a:documentation>Role specific overrides for
Network</a:documentation>
+ </ref>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="proposals">
+ <a:documentation>Role specific overrides for
Proposals</a:documentation>
+ </ref>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="clone_modules">
+ <a:documentation>Role specific overrides for Cloned
modules</a:documentation>
+ </ref>
+ </zeroOrMore>
</interleave>
- <!--
- 'globals? & network?' would also make sense here
- but that has not been requested and tested.
- -->
</element>
</define>
<define name="role_services">
@@ -1840,27 +2193,50 @@
</element>
</define>
<!-- update -->
+ <!-- not more than one partitioning element -->
<define name="productDefines_elements">
- <choice>
- <ref name="textdomain"/>
- <ref name="globals"/>
- <ref name="software"/>
- <ref name="partitioning"/>
- <ref name="network"/>
- <ref name="proposals"/>
- <ref name="workflows"/>
- <ref name="clone_modules"/>
- <ref name="texts"/>
- <ref name="inst_finish_stages"/>
- <ref name="update"/>
- <ref name="system_roles"/>
- </choice>
+ <interleave>
+ <zeroOrMore>
+ <ref name="textdomain"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="globals"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="software"/>
+ </zeroOrMore>
+ <optional>
+ <ref name="partitioning"/>
+ </optional>
+ <zeroOrMore>
+ <ref name="network"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="proposals"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="workflows"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="clone_modules"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="texts"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="inst_finish_stages"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="update"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="system_roles"/>
+ </zeroOrMore>
+ </interleave>
</define>
<start>
<element name="productDefines">
- <zeroOrMore>
- <ref name="productDefines_elements"/>
- </zeroOrMore>
+ <ref name="productDefines_elements"/>
</element>
</start>
<define name="debug_deploying">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-control-3.3.0/package/yast2-installation-control.changes
new/yast2-installation-control-4.0.8/package/yast2-installation-control.changes
---
old/yast2-installation-control-3.3.0/package/yast2-installation-control.changes
2017-08-22 12:09:17.498092272 +0200
+++
new/yast2-installation-control-4.0.8/package/yast2-installation-control.changes
2017-12-14 09:14:01.000000000 +0100
@@ -1,4 +1,65 @@
-------------------------------------------------------------------
+Wed Dec 13 16:05:33 UTC 2017 - [email protected]
+
+- drop copy_to_system element (FATE#320873)
+- 4.0.8
+
+-------------------------------------------------------------------
+Wed Oct 25 11:41:06 CEST 2017 - [email protected]
+
+- fix typo in control.rnc
+- release 4.0.7
+
+-------------------------------------------------------------------
+Tue Oct 17 14:18:34 UTC 2017 - [email protected]
+
+- add fallback_for_desired_size to ng partitioning (fate#318196)
+- 4.0.6
+
+-------------------------------------------------------------------
+Tue Oct 17 09:53:22 UTC 2017 - [email protected]
+
+- adjust control.rnc for storage-ng (fate#318196)
+- 4.0.5
+
+-------------------------------------------------------------------
+Mon Oct 16 08:49:33 UTC 2017 - [email protected]
+
+- extend system role capabilities to redefine also globals,
+ network, proposals and modules to clone (bsc#1063216)
+- 4.0.4
+
+
+-------------------------------------------------------------------
+Wed Oct 11 11:05:19 UTC 2017 - [email protected]
+
+- add snapshots_percentage element and make it mutually exclusive
+ with snapshots_size
+- 4.0.3
+
+-------------------------------------------------------------------
+Tue Oct 10 13:45:06 UTC 2017 - [email protected]
+
+- update control.xml specification to include the new storage-ng
+ partitioning data
+- do no longer allow more than one partitioning element
+- 4.0.2
+
+-------------------------------------------------------------------
+Tue Oct 10 10:29:07 UTC 2017 - [email protected]
+
+- add "self_update_id" to allow defining an ID for self update SCC
+ query (bsc#1055556)
+- 4.0.1
+
+-------------------------------------------------------------------
+Wed Sep 20 13:55:59 UTC 2017 - [email protected]
+
+- Add order element to system roles to allow easier inserting of
+ roles from add ons (bsc#1049297)
+- 4.0.0
+
+-------------------------------------------------------------------
Tue Aug 22 12:02:29 CEST 2017 - [email protected]
- Merged SLE-12-SP3-CASP branch to master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-control-3.3.0/package/yast2-installation-control.spec
new/yast2-installation-control-4.0.8/package/yast2-installation-control.spec
---
old/yast2-installation-control-3.3.0/package/yast2-installation-control.spec
2017-08-22 12:09:17.502092272 +0200
+++
new/yast2-installation-control-4.0.8/package/yast2-installation-control.spec
2017-12-14 09:14:01.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation-control
-Version: 3.3.0
+Version: 4.0.8
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
