Mailinglist Archive: yast-commit (815 mails)

< Previous Next >
[yast-commit] r39878 - in /trunk/storage: package/yast2-storage.changes storage/src/include/do_proposal_flexible.ycp
  • From: fehr@xxxxxxxxxxxxxxxx
  • Date: Wed, 01 Aug 2007 16:32:28 -0000
  • Message-id: <20070801163228.8E0BFB2502@xxxxxxxxxxxxxxxx>
Author: fehr
Date: Wed Aug  1 18:32:28 2007
New Revision: 39878

URL: http://svn.opensuse.org/viewcvs/yast?rev=39878&view=rev
Log:
recognize activated swap as swappable in proposal (#296209)

Modified:
    trunk/storage/package/yast2-storage.changes
    trunk/storage/storage/src/include/do_proposal_flexible.ycp

Modified: trunk/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=39878&r1=39877&r2=39878&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Wed Aug  1 18:32:28 2007
@@ -7,6 +7,7 @@
 - suppress popups about package installation in inst-sys (#296381)
 - fix having obsolete LVM entries displayed after removal of disk
   label (#290779)
+- recognize activated swap as swappable in proposal (#296209)
 
 -------------------------------------------------------------------
 Thu Jul 26 14:32:49 CEST 2007 - fehr@xxxxxxx

Modified: trunk/storage/storage/src/include/do_proposal_flexible.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/do_proposal_flexible.ycp?rev=39878&r1=39877&r2=39878&view=diff
==============================================================================
--- trunk/storage/storage/src/include/do_proposal_flexible.ycp (original)
+++ trunk/storage/storage/src/include/do_proposal_flexible.ycp Wed Aug  1 18:32:28 2007
@@ -84,13 +84,15 @@
 define void flex_init_swapable( map<string,map> tg )
     ``{
     swapable = $[];
+    list swaps = Storage::SwappingPartitions();
     foreach( string dev, map disk, tg,
        ``{
        list<map> sw = filter( map p, disk["partitions"]:[],
                               ``(p["type"]:`unknown!=`extended &&
                                  !p["delete"]:false &&
                                  p["detected_fs"]:`unknown==`swap));
-       sw = filter( map p, sw, ``(Storage::CheckSwapable(p["device"]:"")));
+       sw = filter( map p, sw, ``(contains( swaps, p["device"]:"" )||
+                                  Storage::CheckSwapable(p["device"]:"")));
        foreach( map p, sw, 
            ``{
            swapable[p["device"]:""] = true;

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

< Previous Next >
This Thread
  • No further messages