Author: aschnell Date: Mon Nov 24 14:53:28 2008 New Revision: 53548 URL: http://svn.opensuse.org/viewcvs/yast?rev=53548&view=rev Log: - correctly insert _part for device mapper partitions (bnc #438067) Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Disk.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=53548&r1=53547&r2=53548&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Mon Nov 24 14:53:28 2008 @@ -1051,6 +1051,20 @@ return( need_p ); } + +string +Disk::partNaming(const string& disk) +{ + // TODO: this is hackish + if (boost::starts_with(disk, "/dev/mapper/")) + return "_part"; + else if (needP(disk)) + return "p"; + else + return ""; +} + + string Disk::getPartName( const string& disk, unsigned nr ) { return( disk + (Disk::needP(disk)?"p":"") + decString(nr) ); Modified: trunk/storage/libstorage/src/Disk.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.h?rev=53548&r1=53547&r2=53548&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.h (original) +++ trunk/storage/libstorage/src/Disk.h Mon Nov 24 14:53:28 2008 @@ -58,6 +58,7 @@ void triggerUdevUpdate() const; static bool needP( const string& dev ); + static string partNaming(const string& disk); void setUdevData(const string& path, const list<string>& id); virtual int createPartition( storage::PartitionType type, long unsigned start, long unsigned len, string& device, Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=53548&r1=53547&r2=53548&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Mon Nov 24 14:53:28 2008 @@ -63,7 +63,7 @@ std::ostringstream Buf_Ci; classic(Buf_Ci); if( numeric ) - Buf_Ci << cont->device() << (Disk::needP(cont->device())?"p":"") << num; + Buf_Ci << cont->device() << Disk::partNaming(cont->device()) << num; else Buf_Ci << cont->device() << "/" << nm; dev = Buf_Ci.str(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org