Author: aschnell
Date: Mon Jan 17 17:21:43 2011
New Revision: 63193
URL: http://svn.opensuse.org/viewcvs/yast?rev=63193&view=rev
Log:
- fix for mmcblk devices (bnc #663528)
Modified:
branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc
branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes
branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp
Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc?rev=63193&r1=63192&r2=63193&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc (original)
+++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc Mon Jan 17 17:21:43 2011
@@ -1001,8 +1001,7 @@
}
}
string reg = diskname;
- if( !reg.empty() && reg.find( '/' )!=string::npos &&
- isdigit(reg[reg.length()-1]) )
+ if( !reg.empty() && isdigit(reg[reg.length()-1]) )
reg += "p";
reg += "[0-9]+";
list<string> ps = pp.getMatchingEntries( reg );
@@ -1151,6 +1150,11 @@
{
return true;
}
+ static Regex mmcblkpart( "mmcblk[0123456789]+$" );
+ if ( mmcblkpart.match( disk ) == true )
+ {
+ return true;
+ }
while( !need_p && ihttp://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes?rev=63193&r1=63192&r2=63193&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original)
+++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Mon Jan 17 17:21:43 2011
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Jan 17 17:10:56 CET 2011 - aschnell@suse.de
+
+- fix for mmcblk devices (bnc #663528)
+
+-------------------------------------------------------------------
Tue Oct 05 10:21:24 CEST 2010 - aschnell@suse.de
- do not read /var/run/mdadm/map since the UUID is "reversed"
Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp?rev=63193&r1=63192&r2=63193&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Mon Jan 17 17:21:43 2011
@@ -612,6 +612,15 @@
else
dlen = pos;
}
+ else if( search( device, "/dev/mmcblk" )==0 && size(ls)==2 )
+ {
+ integer pos = find(device, "p");
+ y2milestone("device:%1 pos:%2", device, pos);
+ if (pos == -1)
+ dlen = size(device);
+ else
+ dlen = pos;
+ }
else if( search( device, "/dev/loop" )==0 )
{
dlen = 9;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
