Author: aschnell Date: Thu Aug 19 10:43:51 2010 New Revision: 62407 URL: http://svn.opensuse.org/viewcvs/yast?rev=62407&view=rev Log: - more backports for support of 4k disks Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.h Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc?rev=62407&r1=62406&r2=62407&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc Thu Aug 19 10:43:51 2010 @@ -299,15 +299,6 @@ y2milestone( "c:%lu h:%u s:%u", c, h, s ); } -bool Dasd::detectGeometry() - { - Disk::detectGeometry(); - sector *= 8; - byte_cyl *= 8; - cyl /= 8; - y2milestone( "cyl:%lu sector:%u byte_cyl:%lu", cyl, sector, byte_cyl ); - return( true ); - } int Dasd::doResize( Volume* v ) { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.h?rev=62407&r1=62406&r2=62407&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.h Thu Aug 19 10:43:51 2010 @@ -52,7 +52,6 @@ int getToCommit( storage::CommitStage stage, std::list<Container*>& col, std::list<Volume*>& vol ); int commitChanges( storage::CommitStage stage ); - bool detectGeometry(); protected: enum DasdFormat { DASDF_NONE, DASDF_LDL, DASDF_CDL }; 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=62407&r1=62406&r2=62407&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 Thu Aug 19 10:43:51 2010 @@ -36,7 +36,6 @@ #include "y2storage/Region.h" #include "y2storage/Partition.h" #include "y2storage/ProcPart.h" -#include "y2storage/ProcParts.h" #include "y2storage/Disk.h" #include "y2storage/Storage.h" #include "y2storage/AsciiFile.h" @@ -2280,7 +2279,7 @@ scanPartedLine( *cmd.getLine(0), nr, start, csize, type, id, boot )) { - ProcParts ppart; + ProcPart ppart; y2milestone( "really created at cyl:%ld csize:%ld", start, csize ); p->changeRegion( start, csize, cylinderToKb(csize) ); unsigned long long s=0; @@ -2581,7 +2580,7 @@ { ret = DISK_REMOVE_PARTITION_PARTED_FAILED; } - ProcParts parts; + ProcPart parts; if( parts.findDevice(getPartName(device(), p->OrigNr())) ) callDelpart( p->OrigNr() ); getStorage()->handleHald(false); @@ -3122,6 +3121,7 @@ logfile_name = rhs.logfile_name; sysfs_dir = rhs.sysfs_dir; dmp_slave = rhs.dmp_slave; + no_addpart = rhs.no_addpart; gpt_enlarge = rhs.gpt_enlarge; return( *this ); } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am?rev=62407&r1=62406&r2=62407&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am Thu Aug 19 10:43:51 2010 @@ -53,7 +53,6 @@ Regex.cc Regex.h \ AsciiFile.cc AsciiFile.h \ ProcPart.cc ProcPart.h \ - ProcParts.cc ProcParts.h \ EtcRaidtab.cc EtcRaidtab.h \ ProcMounts.cc ProcMounts.h \ EtcFstab.cc EtcFstab.h \ Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.cc?rev=62407&r1=62406&r2=62407&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.cc Thu Aug 19 10:43:51 2010 @@ -64,6 +64,14 @@ return( ret ); } + + bool + ProcPart::findDevice(const string& device) const + { + return co.find(devName(device)) != co.end(); + } + + bool ProcPart::getSize( const string& Dev, unsigned long long& SizeK ) const { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.h?rev=62407&r1=62406&r2=62407&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.h Thu Aug 19 10:43:51 2010 @@ -39,6 +39,7 @@ bool getInfo( const string& Dev, unsigned long long& SizeK, unsigned long& Major, unsigned long& Minor ) const; bool getSize( const string& Dev, unsigned long long& SizeK ) const; + bool findDevice(const string& device) const; std::list<string> getMatchingEntries( const string& regexp ) const; protected: static string devName( const string& Dev ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org