Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2016-08-18 10:18:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2016-07-24 19:42:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2016-08-18 10:18:34.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Aug 10 11:49:48 CEST 2016 - [email protected] + +- added partition id string for GPT BIOS (bsc#991252) +- 2.26.6 + +------------------------------------------------------------------- +Fri Aug 05 11:05:11 CEST 2016 - [email protected] + +- fixed removing volume groups with encrypted physical volumes + (bsc#989750) +- 2.26.5 + +------------------------------------------------------------------- Old: ---- libstorage-2.26.4.tar.bz2 New: ---- libstorage-2.26.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.8AiMB6/_old 2016-08-18 10:18:35.000000000 +0200 +++ /var/tmp/diff_new_pack.8AiMB6/_new 2016-08-18 10:18:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.26.4 +Version: 2.26.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.26.4.tar.bz2 -> libstorage-2.26.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.4/VERSION new/libstorage-2.26.6/VERSION --- old/libstorage-2.26.4/VERSION 2016-07-14 14:25:10.000000000 +0200 +++ new/libstorage-2.26.6/VERSION 2016-08-10 11:55:10.000000000 +0200 @@ -1 +1 @@ -2.26.4 +2.26.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.4/storage/Device.h new/libstorage-2.26.6/storage/Device.h --- old/libstorage-2.26.4/storage/Device.h 2016-01-18 11:10:13.000000000 +0100 +++ new/libstorage-2.26.6/storage/Device.h 2016-08-08 11:10:12.000000000 +0200 @@ -1,5 +1,6 @@ /* * Copyright (c) [2004-2014] Novell, Inc. + * Copyright (c) 2016 SUSE LLC * * All Rights Reserved. * @@ -72,9 +73,9 @@ unsigned long majorNr() const { return mjr; } unsigned long minorNr() const { return mnr; } - const std::list<string>& altNames() const { return( alt_names ); } - void setAltNames( std::list<string>& li ) { alt_names=li; } - bool sameDevice( const string& device ) const; + const std::list<string>& altNames() const { return alt_names; } + void setAltNames(std::list<string>& li) { alt_names = li; } + bool sameDevice(const string& device) const; // udev path and ids (without leading "/dev/disk/by-*/") virtual string udevPath() const; @@ -123,6 +124,12 @@ unsigned long mnr; list<UsedBy> uby; + + /** + * Alternative names for the device, e.g. udev by-id and by-path + * links. Also includes names of the encrypted device although linux + * storage stack wise that is another block device. + */ list<string> alt_names; map<string, string> userdata; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.4/storage/Partition.cc new/libstorage-2.26.6/storage/Partition.cc --- old/libstorage-2.26.4/storage/Partition.cc 2016-01-18 11:10:13.000000000 +0100 +++ new/libstorage-2.26.6/storage/Partition.cc 2016-08-10 11:55:10.000000000 +0200 @@ -301,6 +301,7 @@ case ID_LINUX: return "Linux"; case ID_LVM: return "Linux LVM"; case ID_RAID: return "Linux RAID"; + case ID_GPT_BIOS: return "GPT BIOS"; } return ""; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.4/storage/PeContainer.cc new/libstorage-2.26.6/storage/PeContainer.cc --- old/libstorage-2.26.4/storage/PeContainer.cc 2016-01-18 11:10:13.000000000 +0100 +++ new/libstorage-2.26.6/storage/PeContainer.cc 2016-08-08 11:10:12.000000000 +0200 @@ -371,18 +371,19 @@ return( ret ); } + int PeContainer::remLvPeDistribution( unsigned long le, map<string,unsigned long>& pe_map, list<Pv>& pl, list<Pv>& pladd ) { int ret=0; y2mil( "le:" << le << " pe_map:" << pe_map ); - list<Pv>::iterator p; map<string,unsigned long>::iterator mit = pe_map.begin(); y2mil( "pl:" << pl ); y2mil( "pladd:" << pladd ); while( le>0 && ret==0 && mit != pe_map.end() ) { + list<Pv>::iterator p; if( findPe( mit->first, pl, p ) || findPe( mit->first, pladd, p ) ) { int tmp = min(le,mit->second); @@ -399,6 +400,7 @@ return( ret ); } + unsigned long PeContainer::sizeToLe( unsigned long long sizeK ) const { if( pe_size>0 ) @@ -501,7 +503,7 @@ bool ret = !pl.empty(); if( ret ) { - const Device *vol; + const Device* vol = NULL; if( getStorage()->findDevice( dv, vol, true ) ) { i = pl.begin(); @@ -516,7 +518,7 @@ ret = i!=pl.end(); } y2mil( "dev:" << dv << " ret:" << ret ); - return( ret ); + return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.4/storage/Volume.cc new/libstorage-2.26.6/storage/Volume.cc --- old/libstorage-2.26.4/storage/Volume.cc 2016-07-14 14:25:10.000000000 +0200 +++ new/libstorage-2.26.6/storage/Volume.cc 2016-08-08 11:10:12.000000000 +0200 @@ -237,9 +237,10 @@ setDmcryptDev(dm,active); } + void Volume::addDmCryptNames( unsigned long minor ) { - y2mil( "alt before:" << altNames() ); + y2mil("alt names before:" << altNames()); string crname = Dm::dmDeviceName(minor); if( !Storage::isDmContainer(*cont)) replaceAltName( "/dev/dm-", crname ); @@ -281,9 +282,13 @@ else alt_names.push_back(pre+s); } - y2mil( "alt after:" << altNames() ); + + alt_names.push_back(dmcrypt_dev); + + y2mil( "alt names after:" << altNames() ); } + void Volume::removeDmCryptNames() { if( !Storage::isDmContainer(*cont)) @@ -302,9 +307,13 @@ } string s = afterLast(dmcrypt_dev,"/"); if( !s.empty() ) + { replaceAltName( "/dev/disk/by-id/dm-name-"+s, "" ); + replaceAltName( "/dev/mapper/" + s, "" ); + } } + const string& Volume::mountDevice() const { if( dmcrypt() && !dmcrypt_dev.empty() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.26.4/storage/gen_md5sum.cc new/libstorage-2.26.6/storage/gen_md5sum.cc --- old/libstorage-2.26.4/storage/gen_md5sum.cc 2016-07-14 14:26:14.000000000 +0200 +++ new/libstorage-2.26.6/storage/gen_md5sum.cc 2016-08-10 11:56:25.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "729a27db15c81a335b9b463bc402a47c" -#define SOURCES_MD5_DATE " Thu Jul 14 12:26:14 UTC 2016 " +#define SOURCES_MD5SUM "faeece6ccfc8ba61d1c3c445bbe7b3c6" +#define SOURCES_MD5_DATE " Wed Aug 10 09:56:25 UTC 2016 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; }
