- removed EVMS entries from control file (already unsupported in SLE11)

yast · Oct 24, 2013 · 42a93b5 · 42a93b5
1 parent a59a3cd
commit 42a93b5
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 22 deletions.
diff --git a/control/control.SLED.xml b/control/control.SLED.xml
@@ -309,17 +309,14 @@ textdomain="control"
     </software>
 
     <partitioning>
-        <evms_config config:type="boolean">false</evms_config>
         <try_separate_home config:type="boolean">true</try_separate_home>
         <limit_try_home>14GB</limit_try_home>
         <root_space_percent>40</root_space_percent>
         <root_base_size>3GB</root_base_size>
         <root_max_size>10GB</root_max_size>
 	<proposal_lvm config:type="boolean">false</proposal_lvm>
-	<proposal_evms config:type="boolean">false</proposal_evms>
 	<vm_desired_size>15GB</vm_desired_size>
 	<vm_home_max_size>25GB</vm_home_max_size>
-	<boot_evms config:type="boolean">false</boot_evms>
 	<btrfs_increase_percentage config:type="integer">100</btrfs_increase_percentage>
     </partitioning>
 

diff --git a/control/control.SLES-for-VMware.xml b/control/control.SLES-for-VMware.xml
@@ -240,17 +240,14 @@ textdomain="control"
     </software>
 
     <partitioning>
-        <evms_config config:type="boolean">true</evms_config>
 	<try_separate_home config:type="boolean">false</try_separate_home>
         <limit_try_home>5GB</limit_try_home>
         <root_space_percent>40</root_space_percent>
         <root_base_size>3GB</root_base_size>
         <root_max_size>10GB</root_max_size>
 	<proposal_lvm config:type="boolean">false</proposal_lvm>
-	<proposal_evms config:type="boolean">false</proposal_evms>
 	<vm_desired_size>15GB</vm_desired_size>
 	<vm_home_max_size>25GB</vm_home_max_size>
-	<boot_evms config:type="boolean">false</boot_evms>
 	<btrfs_increase_percentage config:type="integer">100</btrfs_increase_percentage>
     </partitioning>
 

diff --git a/control/control.SLES.xml b/control/control.SLES.xml
@@ -263,17 +263,14 @@ textdomain="control"
     </software>
 
     <partitioning>
-        <evms_config config:type="boolean">true</evms_config>
 	<try_separate_home config:type="boolean">false</try_separate_home>
         <limit_try_home>5GB</limit_try_home>
         <root_space_percent>40</root_space_percent>
         <root_base_size>3GB</root_base_size>
         <root_max_size>10GB</root_max_size>
 	<proposal_lvm config:type="boolean">false</proposal_lvm>
-	<proposal_evms config:type="boolean">false</proposal_evms>
 	<vm_desired_size>15GB</vm_desired_size>
 	<vm_home_max_size>25GB</vm_home_max_size>
-	<boot_evms config:type="boolean">false</boot_evms>
 	<btrfs_increase_percentage config:type="integer">100</btrfs_increase_percentage>
     </partitioning>
 

diff --git a/control/control.rnc b/control/control.rnc
@@ -403,35 +403,29 @@ software = element software {
 # partitioning
 
 partitioning_elements =
-    evms_config
-    | try_separate_home
+    try_separate_home
     | limit_try_home
     | root_space_percent
     | root_base_size
     | root_max_size
     | proposal_lvm
-    | proposal_evms
     | vm_desired_size
     | vm_home_max_size
-    | boot_evms
     | use_separate_multipath_module
     | prefer_remove
     | vm_keep_unpartitioned_region
     | remove_special_partitions
     | partitions
     | btrfs_increase_percentage
 
-evms_config =			element evms_config { BOOLEAN }
 try_separate_home =		element try_separate_home { BOOLEAN }
 limit_try_home =		element limit_try_home { text }
 root_space_percent =		element root_space_percent { text }
 root_base_size =		element root_base_size { text }
 root_max_size =			element root_max_size { text }
 proposal_lvm =			element proposal_lvm { BOOLEAN }
-proposal_evms =			element proposal_evms { BOOLEAN }
 vm_desired_size =		element vm_desired_size { text }
 vm_home_max_size =		element vm_home_max_size { text }
-boot_evms =			element boot_evms { BOOLEAN }
 prefer_remove =			element prefer_remove { BOOLEAN }
 remove_special_partitions =	element remove_special_partitions { BOOLEAN }
 vm_keep_unpartitioned_region =	element vm_keep_unpartitioned_region { BOOLEAN }

diff --git a/control/control.xml b/control/control.xml
@@ -32,7 +32,6 @@ textdomain="control"
         <selection_type config:type="symbol">auto</selection_type>
     </software>
     <partitioning>
-        <evms_config config:type="boolean">false</evms_config>
         <try_separate_home config:type="boolean">true</try_separate_home>
         <limit_try_home>5GB</limit_try_home>
         <root_space_percent>40</root_space_percent>

diff --git a/control/docs/examples/update-difffileformat.xml b/control/docs/examples/update-difffileformat.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0"?>
 <productDefines  xmlns="http://www.suse.com/1.0/yast2ns"
     xmlns:config="http://www.suse.com/1.0/configns">
@@ -12,7 +11,6 @@
     <selection_type config:type="symbol">auto</selection_type>
   </software>
   <partitioning>
-    <evms_config config:type="boolean">false</evms_config>
     <root_max_size>10G</root_max_size>
   </partitioning>
   <network>

diff --git a/control/examples/add-on-2.xml b/control/examples/add-on-2.xml
@@ -11,7 +11,6 @@
     <selection_type config:type="symbol">auto</selection_type>
   </software>
   <partitioning>
-    <evms_config config:type="boolean">false</evms_config>
     <root_max_size>10G</root_max_size>
   </partitioning>
   <network>

diff --git a/control/examples/custom.xml b/control/examples/custom.xml
@@ -25,7 +25,6 @@ textdomain="control"
         <base_selection>Minimal+X11</base_selection>
     </software>
     <partitioning>
-        <evms_config config:type="boolean">false</evms_config>
         <partitions config:type="list">
             <partition>
                 <disk config:type="integer">2</disk>

diff --git a/control/tests/test.xml b/control/tests/test.xml
@@ -22,7 +22,6 @@ textdomain="control"
         <selection_type config:type="symbol">auto</selection_type>
     </software>
     <partitioning>
-        <evms_config config:type="boolean">false</evms_config>
     </partitioning>
 
     <proposals config:type="list">