commit libstorage for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2013-06-28 11:50:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2013-05-27 09:52:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2013-06-28 11:50:54.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jun 19 12:20:14 CEST 2013 - fehr@suse.de
+
+- version 2.24.1
+- adapt to changed functionality of losetup (bnc#825503)
+
+-------------------------------------------------------------------
Old:
----
libstorage-2.24.0.tar.bz2
New:
----
libstorage-2.24.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage.spec ++++++
--- /var/tmp/diff_new_pack.HVgG3f/_old 2013-06-28 11:50:56.000000000 +0200
+++ /var/tmp/diff_new_pack.HVgG3f/_new 2013-06-28 11:50:56.000000000 +0200
@@ -17,7 +17,7 @@
Name: libstorage
-Version: 2.24.0
+Version: 2.24.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: libstorage-%{version}.tar.bz2
++++++ libstorage-2.24.0.tar.bz2 -> libstorage-2.24.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.24.0/VERSION new/libstorage-2.24.1/VERSION
--- old/libstorage-2.24.0/VERSION 2013-04-16 17:08:01.000000000 +0200
+++ new/libstorage-2.24.1/VERSION 2013-06-19 12:25:52.000000000 +0200
@@ -1 +1 @@
-2.24.0
+2.24.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.24.0/storage/Loop.cc new/libstorage-2.24.1/storage/Loop.cc
--- old/libstorage-2.24.0/storage/Loop.cc 2013-02-20 18:26:33.000000000 +0100
+++ new/libstorage-2.24.1/storage/Loop.cc 2013-06-19 12:25:52.000000000 +0200
@@ -42,16 +42,12 @@
bool dmcrypt, const string& dm_dev, SystemInfo& systeminfo,
SystemCmd& losetup)
: Volume(d, 0, 0), lfile(LoopFile), reuseFile(true), delFile(false)
-{
+ {
y2mil("constructed loop dev:" << LoopDev << " file:" << LoopFile <<
" dmcrypt:" << dmcrypt << " dmdev:" << dm_dev);
if( d.type() != LOOP )
y2err("constructed loop with wrong container");
loop_dev = fstab_loop_dev = LoopDev;
- if( loop_dev.empty() )
- getLoopData( losetup );
- if( loop_dev.empty() )
- getFreeLoop(losetup, d.usedNumbers());
string proc_dev;
if( !dmcrypt )
{
@@ -76,7 +72,7 @@
is_loop = true;
unsigned long long s = 0;
if( !proc_dev.empty() )
- systeminfo.getProcParts().getSize(proc_dev, s);
+ systeminfo.getProcParts().getSize(proc_dev, s);
if( s>0 )
{
setSize( s );
@@ -87,18 +83,19 @@
if( stat( lfile.c_str(), &st )>=0 )
setSize( st.st_size/1024 );
}
-}
+ }
Loop::Loop(const LoopCo& d, const string& file, bool reuseExisting,
unsigned long long sizeK, bool dmcr)
: Volume(d, 0, 0), lfile(file), reuseFile(reuseExisting), delFile(false)
-{
+ {
y2mil("constructed loop file:" << file << " reuseExisting:" << reuseExisting <<
" sizek:" << sizeK << " dmcrypt:" << dmcr);
if( d.type() != LOOP )
y2err("constructed loop with wrong container");
- getFreeLoop();
+ SystemCmd c(LOSETUPBIN " -a");
+ loop_dev = getFreeLoop(c,d.usedNumbers());
is_loop = true;
if( !dmcr )
{
@@ -120,7 +117,7 @@
checkReuse();
if( !reuseFile )
setSize( sizeK );
-}
+ }
Loop::Loop(const LoopCo& c, const Loop& v)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.24.0/storage/Storage.cc new/libstorage-2.24.1/storage/Storage.cc
--- old/libstorage-2.24.0/storage/Storage.cc 2013-05-13 13:26:32.000000000 +0200
+++ new/libstorage-2.24.1/storage/Storage.cc 2013-06-19 12:25:52.000000000 +0200
@@ -5364,7 +5364,7 @@
return( ret );
}
-bool Storage::usedDmName( const string& nm ) const
+bool Storage::usedDmName( const string& nm, const Volume* volp ) const
{
bool ret = false;
y2mil("nm:" << nm);
@@ -5373,6 +5373,7 @@
while( !ret && v!=vp.end() )
{
ret = v->dmcryptDevice()==nm || (v->cType()==DM&&v->device()==nm);
+ ret = ret && &(*v)!=volp;
if( !ret )
++v;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.24.0/storage/Storage.h new/libstorage-2.24.1/storage/Storage.h
--- old/libstorage-2.24.0/storage/Storage.h 2013-04-16 17:08:01.000000000 +0200
+++ new/libstorage-2.24.1/storage/Storage.h 2013-06-19 12:25:52.000000000 +0200
@@ -261,7 +261,7 @@
string prependRoot(const string& mp) const;
const string& tmpDir() const { return tempdir; }
bool hasIScsiDisks() const;
- bool usedDmName( const string& nm ) const;
+ bool usedDmName( const string& nm, const Volume* volp ) const;
string bootMount() const;
const ArchInfo& getArchInfo() const { return archinfo; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.24.0/storage/Volume.cc new/libstorage-2.24.1/storage/Volume.cc
--- old/libstorage-2.24.0/storage/Volume.cc 2013-04-04 15:36:33.000000000 +0200
+++ new/libstorage-2.24.1/storage/Volume.cc 2013-06-19 12:25:52.000000000 +0200
@@ -1934,11 +1934,16 @@
return( ret );
}
-string Volume::getLosetupCmd( storage::EncryptType, const string& pwdfile ) const
+string Volume::getLosetupCmd( const string& fpath ) const
{
- string cmd = LOSETUPBIN " " + quote(loop_dev) + " ";
- const Loop* l = static_cast
participants (1)
-
root@hilbert.suse.de