[yast-commit] r63192 - in /branches/SuSE-Code-11-SP1-Branch/storage: VERSION libstorage/src/Disk.cc package/yast2-storage.changes storage/src/modules/Storage.ycp
Author: aschnell
Date: Mon Jan 17 17:21:28 2011
New Revision: 63192
URL: http://svn.opensuse.org/viewcvs/yast?rev=63192&view=rev
Log:
- fix for mmcblk devices (bnc #663528)
Modified:
branches/SuSE-Code-11-SP1-Branch/storage/VERSION
branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc
branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes
branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp
Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/VERSION?rev=63192&r1=63191&r2=63192&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/storage/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/storage/VERSION Mon Jan 17 17:21:28 2011
@@ -1 +1 @@
-2.17.99
+2.17.99.1
Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc?rev=63192&r1=63191&r2=63192&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc (original)
+++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc Mon Jan 17 17:21:28 2011
@@ -963,8 +963,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 );
@@ -1109,6 +1108,11 @@
{
return true;
}
+ static Regex mmcblkpart( "mmcblk[0123456789]+$" );
+ if ( mmcblkpart.match( disk ) == true )
+ {
+ return true;
+ }
while( !need_p && i
participants (1)
-
aschnell@svn2.opensuse.org