Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at Thu Feb 11 21:15:54 CET 2010. -------- --- libstorage/libstorage.changes 2010-02-09 14:48:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/libstorage/libstorage.changes 2010-02-11 20:59:18.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 10 11:59:30 CET 2010 - fehr@suse.de + +- provide name of encrypted dm device in VolumeInfo (bnc #577127) +- 2.19.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libstorage-2.19.8.tar.bz2 New: ---- libstorage-2.19.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.bzA21j/_old 2010-02-11 21:15:27.000000000 +0100 +++ /var/tmp/diff_new_pack.bzA21j/_new 2010-02-11 21:15:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libstorage (Version 2.19.8) +# spec file for package libstorage (Version 2.19.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: libstorage -Version: 2.19.8 +Version: 2.19.9 Release: 1 License: GPL Group: System/Libraries @@ -134,5 +134,4 @@ %defattr(-,root,root) %{python_sitelib}/libstorage.py* %attr(755,root,root) %{python_sitearch}/_libstorage.so - %changelog ++++++ libstorage-2.19.8.tar.bz2 -> libstorage-2.19.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/VERSION new/libstorage-2.19.9/VERSION --- old/libstorage-2.19.8/VERSION 2010-02-09 13:11:33.000000000 +0100 +++ new/libstorage-2.19.9/VERSION 2010-02-10 12:06:54.000000000 +0100 @@ -1 +1 @@ -2.19.8 +2.19.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/bindings/python/libstorage.py new/libstorage-2.19.9/bindings/python/libstorage.py --- old/libstorage-2.19.8/bindings/python/libstorage.py 2010-02-09 14:22:03.000000000 +0100 +++ new/libstorage-2.19.9/bindings/python/libstorage.py 2010-02-10 12:11:06.000000000 +0100 @@ -520,6 +520,9 @@ __swig_setmethods__["mount"] = _libstorage.VolumeInfo_mount_set __swig_getmethods__["mount"] = _libstorage.VolumeInfo_mount_get if _newclass:mount = _swig_property(_libstorage.VolumeInfo_mount_get, _libstorage.VolumeInfo_mount_set) + __swig_setmethods__["crypt_device"] = _libstorage.VolumeInfo_crypt_device_set + __swig_getmethods__["crypt_device"] = _libstorage.VolumeInfo_crypt_device_get + if _newclass:crypt_device = _swig_property(_libstorage.VolumeInfo_crypt_device_get, _libstorage.VolumeInfo_crypt_device_set) __swig_setmethods__["mount_by"] = _libstorage.VolumeInfo_mount_by_set __swig_getmethods__["mount_by"] = _libstorage.VolumeInfo_mount_by_get if _newclass:mount_by = _swig_property(_libstorage.VolumeInfo_mount_by_get, _libstorage.VolumeInfo_mount_by_set) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/Disk.cc new/libstorage-2.19.9/storage/Disk.cc --- old/libstorage-2.19.8/storage/Disk.cc 2010-02-09 12:22:21.000000000 +0100 +++ new/libstorage-2.19.9/storage/Disk.cc 2010-02-10 12:07:16.000000000 +0100 @@ -59,6 +59,7 @@ dev = Name; else dev = "/dev/" + Name; + getMajorMinor(); size_k = SizeK; y2deb("constructed disk " << dev); } @@ -77,6 +78,7 @@ sector = new_sector = 32; cyl = new_cyl = std::max( size_k*2 / head / sector, 1ULL ); byte_cyl = head * sector * 512; + getMajorMinor(); unsigned long long sz = size_k; Partition *p = new Partition( *this, num, sz, 0, cyl, PRIMARY ); if (systeminfo.getProcParts().getSize(p->device(), sz) && sz > 0) @@ -285,21 +287,7 @@ bool Disk::getSysfsInfo(const string& sysfsdir, SysfsInfo& sysfsinfo) { - string sysfsfile = sysfsdir + "/dev"; - if (access(sysfsfile.c_str(), R_OK) == 0) - { - ifstream file(sysfsfile.c_str()); - classic(file); - char c; - file >> sysfsinfo.mjr >> c >> sysfsinfo.mnr; - } - else - { - y2war("reading " << sysfsfile << " failed"); - return false; - } - - sysfsfile = sysfsdir + "/device"; + string sysfsfile = sysfsdir + "/device"; if (!readlink(sysfsfile, sysfsinfo.device)) { // not always available so no error @@ -355,9 +343,8 @@ return false; } - y2mil("sysfsdir:" << sysfsdir << " mjr:" << sysfsinfo.mjr << " mnr:" << sysfsinfo.mnr << - " device:" << sysfsinfo.device << " range:" << sysfsinfo.range << " size:" << - sysfsinfo.size); + y2mil("sysfsdir:" << sysfsdir << " device:" << sysfsinfo.device << " range:" << + sysfsinfo.range << " size:" << sysfsinfo.size); return true; } @@ -377,9 +364,6 @@ if (range <= 1) ret = false; - mjr = sysfsinfo.mjr; - mnr = sysfsinfo.mnr; - if (boost::contains(sysfsinfo.device, "/session")) iscsi = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/Disk.h new/libstorage-2.19.9/storage/Disk.h --- old/libstorage-2.19.8/storage/Disk.h 2010-02-08 17:02:41.000000000 +0100 +++ new/libstorage-2.19.9/storage/Disk.h 2010-02-10 12:07:16.000000000 +0100 @@ -140,8 +140,6 @@ struct SysfsInfo { - unsigned long mjr; - unsigned long mnr; string device; unsigned long range; unsigned long long size; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/Dm.cc new/libstorage-2.19.9/storage/Dm.cc --- old/libstorage-2.19.8/storage/Dm.cc 2010-02-09 12:17:03.000000000 +0100 +++ new/libstorage-2.19.9/storage/Dm.cc 2010-02-10 12:07:16.000000000 +0100 @@ -81,15 +81,17 @@ unsigned Dm::dmMajor() { if( dm_major==0 ) - getDmMajor(); + { + dm_major = getMajorDevices("device-mapper"); + y2mil("dm_major:" << dm_major); + } return( dm_major ); } + void Dm::getTableInfo() { - if( dm_major==0 ) - getDmMajor(); SystemCmd c(DMSETUPBIN " table " + quote(tname)); inactiv = c.retcode()!=0; y2mil("table:" << tname << " retcode:" << c.retcode() << " numLines:" << c.numLines() << @@ -477,11 +479,6 @@ return( ret ); } -void Dm::getDmMajor() - { - dm_major = getMajorDevices( "device-mapper" ); - y2mil("dm_major:" << dm_major); - } void Dm::getInfo( DmInfo& tinfo ) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/Dm.h new/libstorage-2.19.9/storage/Dm.h --- old/libstorage-2.19.8/storage/Dm.h 2009-12-03 16:15:05.000000000 +0100 +++ new/libstorage-2.19.9/storage/Dm.h 2010-02-10 12:07:16.000000000 +0100 @@ -86,7 +86,6 @@ void init(); const PeContainer* pec() const; virtual const string shortPrintedName() const { return( "Dm" ); } - static void getDmMajor(); string tname; string target; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/Loop.cc new/libstorage-2.19.9/storage/Loop.cc --- old/libstorage-2.19.8/storage/Loop.cc 2010-02-09 12:17:03.000000000 +0100 +++ new/libstorage-2.19.9/storage/Loop.cc 2010-02-10 12:07:16.000000000 +0100 @@ -219,18 +219,17 @@ return getStorage()->root() + lfile; } -unsigned Loop::major() + +unsigned Loop::loopMajor() { if( loop_major==0 ) - getLoopMajor(); + { + loop_major = getMajorDevices("loop"); + y2mil("loop_major:" << loop_major); + } return( loop_major ); } -void Loop::getLoopMajor() - { - loop_major = getMajorDevices( "loop" ); - y2mil("loop_major:" << loop_major); - } string Loop::loopDeviceName( unsigned num ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/Loop.h new/libstorage-2.19.9/storage/Loop.h --- old/libstorage-2.19.8/storage/Loop.h 2009-12-03 16:15:05.000000000 +0100 +++ new/libstorage-2.19.9/storage/Loop.h 2010-02-10 12:07:16.000000000 +0100 @@ -64,7 +64,7 @@ void getInfo( storage::LoopInfo& info ) const; bool equalContent( const Loop& rhs ) const; void logDifference( const Loop& d ) const; - static unsigned major(); + static unsigned loopMajor(); static string loopDeviceName( unsigned num ); static bool notDeleted( const Loop& l ) { return( !l.deleted() ); } @@ -72,7 +72,6 @@ protected: void checkReuse(); - static void getLoopMajor(); string lfile; bool reuseFile; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/LoopCo.cc new/libstorage-2.19.9/storage/LoopCo.cc --- old/libstorage-2.19.8/storage/LoopCo.cc 2010-01-28 15:03:54.000000000 +0100 +++ new/libstorage-2.19.9/storage/LoopCo.cc 2010-02-10 12:07:16.000000000 +0100 @@ -82,7 +82,7 @@ void LoopCo::init() { - mjr = Loop::major(); + mjr = Loop::loopMajor(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/Md.cc new/libstorage-2.19.9/storage/Md.cc --- old/libstorage-2.19.8/storage/Md.cc 2010-02-09 12:17:03.000000000 +0100 +++ new/libstorage-2.19.9/storage/Md.cc 2010-02-10 12:07:16.000000000 +0100 @@ -591,17 +591,15 @@ computeSize(); } + unsigned Md::mdMajor() { if( md_major==0 ) - getMdMajor(); - return( md_major ); - } - -void Md::getMdMajor() { - md_major = getMajorDevices( "md" ); - y2mil("md_major:" << md_major); + md_major = getMajorDevices("md"); + y2mil("md_major:" << md_major); + } + return( md_major ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/Md.h new/libstorage-2.19.9/storage/Md.h --- old/libstorage-2.19.8/storage/Md.h 2010-02-03 11:09:15.000000000 +0100 +++ new/libstorage-2.19.9/storage/Md.h 2010-02-10 12:07:16.000000000 +0100 @@ -87,8 +87,6 @@ void computeSize(); - static void getMdMajor(); - static MdType toMdType(const string& val); static MdParity toMdParity(const string& val); static MdArrayState toMdArrayState(const string& val); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/MdPartCo.cc new/libstorage-2.19.9/storage/MdPartCo.cc --- old/libstorage-2.19.8/storage/MdPartCo.cc 2010-02-09 12:17:03.000000000 +0100 +++ new/libstorage-2.19.9/storage/MdPartCo.cc 2010-02-10 12:07:16.000000000 +0100 @@ -1408,18 +1408,6 @@ } -unsigned MdPartCo::mdMajor() - { - if( md_major==0 ) - getMdMajor(); - return( md_major ); - } - -void MdPartCo::getMdMajor() - { - md_major = getMajorDevices( "md" ); - } - void MdPartCo::setSize(unsigned long long size ) { size_k = size; @@ -2117,8 +2105,6 @@ const string MdPartCo::sysfs_path = "/sys/devices/virtual/block/"; -unsigned MdPartCo::md_major = 0; - bool MdPartCo::active = false; void MdPartCo::logData(const string& Dir) const {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/MdPartCo.h new/libstorage-2.19.9/storage/MdPartCo.h --- old/libstorage-2.19.8/storage/MdPartCo.h 2010-02-09 12:17:03.000000000 +0100 +++ new/libstorage-2.19.9/storage/MdPartCo.h 2010-02-10 12:07:16.000000000 +0100 @@ -142,9 +142,6 @@ void getSpareDevs(std::list<string>& devices ); - /* MD Device major number. */ - static unsigned mdMajor(); - static void activate( bool val, const string& tmpDir ); static bool isActive() { return active; } @@ -303,8 +300,6 @@ static CType envSelection(const string& name); static bool havePartsInProc(const string& name, SystemInfo& systeminfo); - static void getMdMajor(); - unsigned long chunk_size; storage::MdType md_type; storage::MdParity md_parity; @@ -323,8 +318,6 @@ std::list<string> devs; std::list<string> spare; - static unsigned md_major; - /* Name that is present in /dev/md directory.*/ string md_name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/PeContainer.cc new/libstorage-2.19.9/storage/PeContainer.cc --- old/libstorage-2.19.8/storage/PeContainer.cc 2010-01-28 15:03:54.000000000 +0100 +++ new/libstorage-2.19.9/storage/PeContainer.cc 2010-02-10 12:07:16.000000000 +0100 @@ -668,7 +668,7 @@ list<string> ls = splitString(pair); if( majorNr()>0 && mj==majorNr() && mi==minorNr()) ret = device(); - if( mj==Loop::major() ) + if( mj==Loop::loopMajor() ) ret = Loop::loopDeviceName(mi); if( ret.empty() && mj==Dm::dmMajor() && ls.size()>=2 ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/StorageInterface.h new/libstorage-2.19.9/storage/StorageInterface.h --- old/libstorage-2.19.8/storage/StorageInterface.h 2010-02-01 18:00:55.000000000 +0100 +++ new/libstorage-2.19.9/storage/StorageInterface.h 2010-02-10 11:43:50.000000000 +0100 @@ -349,6 +349,7 @@ string name; string device; string mount; + string crypt_device; MountByType mount_by; list<UsedByInfo> usedBy; UsedByType usedByType; // deprecated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.19.8/storage/Volume.cc new/libstorage-2.19.9/storage/Volume.cc --- old/libstorage-2.19.8/storage/Volume.cc 2010-02-09 12:17:03.000000000 +0100 +++ new/libstorage-2.19.9/storage/Volume.cc 2010-02-10 11:47:13.000000000 +0100 @@ -2789,6 +2789,8 @@ info.minor = mnr; info.name = nm; info.device = dev; + if( dmcrypt() ) + info.crypt_device = dmcrypt_dev; info.mount = mp; info.mount_by = mount_by; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org