[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 && ihttp://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes?rev=63192&r1=63191&r2=63192&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Mon Jan 17 17:21:28 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 17 17:10:56 CET 2011 - aschnell@suse.de + +- fix for mmcblk devices (bnc #663528) +- 2.17.99.1 + +------------------------------------------------------------------- Wed May 5 16:27:23 CEST 2010 - fehr@suse.de - call xfs_check instead of fsck -n -t xfs since /sbin/fsck is Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp?rev=63192&r1=63191&r2=63192&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Mon Jan 17 17:21:28 2011 @@ -604,6 +604,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