Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at Mon Oct 12 14:39:52 CEST 2009. -------- --- libstorage/libstorage.changes 2009-09-29 14:30:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/libstorage/libstorage.changes 2009-10-01 17:39:41.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 01 15:22:11 CEST 2009 - aschnell@suse.de + +- fixed fstab entries for existing encrypted volumes (bnc #530173) +- 2.18.22 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libstorage-2.18.21.tar.bz2 New: ---- libstorage-2.18.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.KJhUoB/_old 2009-10-12 14:38:15.000000000 +0200 +++ /var/tmp/diff_new_pack.KJhUoB/_new 2009-10-12 14:38:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libstorage (Version 2.18.21) +# spec file for package libstorage (Version 2.18.22) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: libstorage -Version: 2.18.21 -Release: 4 +Version: 2.18.22 +Release: 1 License: GPL Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libstorage-2.18.21.tar.bz2 -> libstorage-2.18.22.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.21/VERSION new/libstorage-2.18.22/VERSION --- old/libstorage-2.18.21/VERSION 2009-08-28 16:54:52.000000000 +0200 +++ new/libstorage-2.18.22/VERSION 2009-10-01 15:22:00.000000000 +0200 @@ -1 +1 @@ -2.18.21 +2.18.22 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.21/storage/Blkid.h new/libstorage-2.18.22/storage/Blkid.h --- old/libstorage-2.18.21/storage/Blkid.h 2009-08-20 16:25:42.000000000 +0200 +++ new/libstorage-2.18.22/storage/Blkid.h 2009-09-30 15:35:40.000000000 +0200 @@ -21,7 +21,7 @@ struct Entry { - Entry() : fstype(FSNONE), uuid(), label(), luks(false) {} + Entry() : fstype(FSUNKNOWN), uuid(), label(), luks(false) {} FsType fstype; string uuid; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.21/storage/Partition.cc new/libstorage-2.18.22/storage/Partition.cc --- old/libstorage-2.18.21/storage/Partition.cc 2009-08-31 11:50:20.000000000 +0200 +++ new/libstorage-2.18.22/storage/Partition.cc 2009-10-08 17:22:55.000000000 +0200 @@ -82,20 +82,17 @@ return( i==alt_names.end() ? empty_string : *i ); } -string Partition::sysfsPath() const + + string + Partition::sysfsPath() const { - string ret = disk()->sysfsDir() + "/"; - string tmp = undevDevice(dev); - string::size_type pos = 0; - while( (pos=tmp.find( '/', pos ))!=string::npos ) - { - tmp[pos++] = '!'; - } - ret += tmp; - y2mil( "ret:" << ret ); - return( ret ); + string tmp = undevDevice(dev); + string ret = disk()->sysfsDir() + "/" + boost::replace_all_copy(tmp, "/", "!"); + y2mil("ret:" << ret); + return ret; } + bool Partition::intersectArea( const Region& r, unsigned fuzz ) const { return( r.intersect( reg ).len()>fuzz ); @@ -122,12 +119,8 @@ { alt_names.remove_if(string_contains("/by-id/")); - list<string>::const_iterator j = disk()->udevId().begin(); - while( j!=disk()->udevId().end() ) - { + for (list<string>::const_iterator j = disk()->udevId().begin(); j != disk()->udevId().end(); ++j) alt_names.push_back( udevCompleteIdPath( *j, num )); - ++j; - } } @@ -154,11 +147,10 @@ { orig_num = num; } - addAltUdevId( num ); - list<string>::iterator i = find_if( alt_names.begin(), alt_names.end(), - string_contains( "/by-path/" )); - if( i!=alt_names.end() ) - *i = udevCompletePathPath( disk()->udevPath(), num ); + + addAltUdevId(num); + addAltUdevPath(num); + nm.clear(); setNameDev(); getMajorMinor( dev, mjr, mnr ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.21/storage/Volume.cc new/libstorage-2.18.22/storage/Volume.cc --- old/libstorage-2.18.21/storage/Volume.cc 2009-09-29 15:44:05.000000000 +0200 +++ new/libstorage-2.18.22/storage/Volume.cc 2009-10-02 14:21:45.000000000 +0200 @@ -401,7 +401,7 @@ if (found) { - y2mil("device:" << mountDevice() << " entry:" << entry); + y2mil("device:" << device() << " mountDevice:" << mountDevice() << " entry:" << entry); detected_fs = fs = entry.fstype; @@ -1902,14 +1902,16 @@ if( ret!=0 && losetup_done ) loUnsetup(); } + if (ret == 0) + { + updateFsData(); + } if (ret == 0 && encryption != ENC_NONE) { doFstabUpdate(); } - if( ret==0 ) - updateFsData(); y2mil("ret:" << ret); - return( ret ); + return ret; } string Volume::labelText( bool doing ) const ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org