Mailinglist Archive: yast-commit (183 mails)

[ug@xxxxxxxxxxxxxxxxx]

Author: ug
Date: Tue Oct 26 11:02:05 2010
New Revision: 62682

URL: http://svn.opensuse.org/viewcvs/yast?rev=62682&view=rev
Log:
reusing lots of partitions fixed (bnc#648082)

Modified:
    branches/SuSE-SLE-10-SP4-Branch/autoinstallation/VERSION
    branches/SuSE-SLE-10-SP4-Branch/autoinstallation/package/autoyast2.changes
    branches/SuSE-SLE-10-SP4-Branch/autoinstallation/src/include/autopart.ycp

Modified: branches/SuSE-SLE-10-SP4-Branch/autoinstallation/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/autoinstallation/VERSION?rev=62682&r1=62681&r2=62682&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP4-Branch/autoinstallation/VERSION (original)
+++ branches/SuSE-SLE-10-SP4-Branch/autoinstallation/VERSION Tue Oct 26 
11:02:05 2010
@@ -1 +1 @@
-2.13.103
+2.13.104

Modified: 
branches/SuSE-SLE-10-SP4-Branch/autoinstallation/package/autoyast2.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/autoinstallation/package/autoyast2.changes?rev=62682&r1=62681&r2=62682&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP4-Branch/autoinstallation/package/autoyast2.changes 
(original)
+++ branches/SuSE-SLE-10-SP4-Branch/autoinstallation/package/autoyast2.changes 
Tue Oct 26 11:02:05 2010
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Tue Oct 26 10:48:11 CEST 2010 - ug@xxxxxxx
+
+- reusing a lot of partitions can take ages to calculate
+- resuing a lot of partitions can fail
+- bnc#648082
+- 2.13.104
+
+-------------------------------------------------------------------
 Tue Jun 30 10:07:18 CEST 2009 - ug@xxxxxxx
 
 - LVM "max" calculation is less strict (bnc#517052)

Modified: 
branches/SuSE-SLE-10-SP4-Branch/autoinstallation/src/include/autopart.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/autoinstallation/src/include/autopart.ycp?rev=62682&r1=62681&r2=62682&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP4-Branch/autoinstallation/src/include/autopart.ycp 
(original)
+++ branches/SuSE-SLE-10-SP4-Branch/autoinstallation/src/include/autopart.ycp 
Tue Oct 26 11:02:05 2010
@@ -1135,12 +1135,16 @@
           * extended is not possible and number of requested partitions is 
less than all
           * available primaries and logical slots )
           */
+
+         /*
         if( size(g["gap"]:[])>0 &&
             ((g["extended_possible"]:false && 
 //            size(g["free_pnr"]:[])>0 &&             // reusing all 4 
primaries will fail with this
               size(ps)+1 <= size(g["ext_pnr"]:[])+size(g["free_pnr"]:[])) ||
              (!g["extended_possible"]:false &&
               size(ps) <= size(g["ext_pnr"]:[])+size(g["free_pnr"]:[]))) )
+       */
+       if( size(g["gap"]:[])>0 )
         {
             map lg = (map) eval(g);
 
@@ -1230,7 +1234,15 @@
                  ``{
             y2milestone( "start: gap section  %1", e );
             
-            if( part["max_cyl"]:0 <= e["end"]:0 &&     
+            // speed up partitioning calculation (bnc#620212)
+            boolean reuseCondition = true;
+            if( part["create"]:true == false &&
+                (( haskey( part, "partition_nr" ) && part["partition_nr"]:0 != 
e["nr"]:0 )) ) {
+                y2milestone("gap can't be used. %1 != %2", 
part["partition_nr"]:0, e["nr"]:0 );
+                reuseCondition = false;
+            }
+            if( reuseCondition &&
+                part["max_cyl"]:0 <= e["end"]:0 &&     
                 part["cylinders"]:0 <= e["cylinders"]:0 &&
                 (!e["extended"]:false && (size(lg["free_pnr"]:[])>0 || ! 
creation_needed ) ||
                  e["extended"]:false && size(lg["ext_pnr"]:[])>0)

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx