Mailinglist Archive: yast-commit (265 mails)

< Previous Next >
[yast-commit] r67256 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
Author: fehr
Date: Tue Jan 24 13:53:33 2012
New Revision: 67256

URL: http://svn.opensuse.org/viewcvs/yast?rev=67256&view=rev
Log:
prevent display of outdated data with simple btrfs volumes

Modified:
trunk/storage/package/yast2-storage.changes
trunk/storage/storage/src/modules/Storage.ycp

Modified: trunk/storage/package/yast2-storage.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=67256&r1=67255&r2=67256&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Tue Jan 24 13:53:33 2012
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Jan 24 13:52:45 CET 2012 - fehr@xxxxxxx
+
+- prevent display of outdated data with simple btrfs volumes
+
+-------------------------------------------------------------------
Thu Jan 19 10:52:02 GMT 2012 - aschnell@xxxxxxx

- improved layout for small screens (bnc#740006)

Modified: trunk/storage/storage/src/modules/Storage.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=67256&r1=67255&r2=67256&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/Storage.ycp (original)
+++ trunk/storage/storage/src/modules/Storage.ycp Tue Jan 24 13:53:33 2012
@@ -1979,9 +1979,18 @@
else
{
tg[dev] = getContainerInfo(c);
- if( dev=="/dev/btrfs" )
- tg = HandleBtrfsSimpleVolumes( tg );
}
+ integer numbt = size(filter( map p, tg[dev,"partitions"]:[],
``(p["used_fs"]:`unknown==`btrfs )));
+ y2milestone( "UpdateTargetMapDisk btrfs:%1", numbt );
+ if( numbt>0 && dev!="/dev/btrfs" )
+ {
+ map bt = tg["/dev/btrfs"]:$[];
+ if( size(bt)==0 )
+ bt["type"] = `CT_BTRFS;
+ tg["/dev/btrfs"] = getContainerInfo(bt);
+ }
+ if( numbt>0 || dev=="/dev/btrfs" )
+ tg = HandleBtrfsSimpleVolumes( tg );
StorageMap[targets_key] = tg;
//SCR::Write(.target.ycp, "/tmp/upd_disk_aft_"+sformat("%1",count),
StorageMap[targets_key]:$[] );
//count = count+1;
@@ -1995,6 +2004,8 @@
string cdev="";
map mdev = GetPartition( tg, dev );
y2milestone( "UpdateTargetMapDev mdev %1", mdev );
+ boolean btrfs = mdev["used_fs"]:`unknown == `btrfs;
+ y2milestone( "UpdateTargetMapDev btrfs %1", btrfs );
foreach( string key, map d, tg,
``{
if( size(cdev)==0 &&
@@ -2035,7 +2046,9 @@
else
y2error( "UpdateTargetMapDev key %1 not found in target",
disk["device"]:"" );
y2milestone( "UpdateTargetMapDev mdev %1", mdev );
- if( mdev["used_fs"]:`unknown == `btrfs )
+ btrfs = btrfs || mdev["used_fs"]:`unknown == `btrfs;
+ y2milestone( "UpdateTargetMapDev btrfs %1", btrfs );
+ if( btrfs )
{
map bt = tg["/dev/btrfs"]:$[];
if( size(bt)==0 )

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

< Previous Next >
This Thread
  • No further messages