Hello community,
here is the log from the commit of package libstorage for openSUSE:12.1 checked
in at 2011-10-27 19:32:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/libstorage (Old)
and /work/SRC/openSUSE:12.1/.libstorage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage", Maintainer is "aschn...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.1/libstorage/libstorage.changes 2011-10-24
13:04:57.000000000 +0200
+++ /work/SRC/openSUSE:12.1/.libstorage.new/libstorage.changes 2011-10-28
17:10:48.000000000 +0200
@@ -1,0 +2,18 @@
+Wed Oct 26 13:17:43 CEST 2011 - f...@suse.de
+
+- 2.21.12
+- make /dev/md/ names known to libstorage if present (bnc#726319)
+- do not set fsck flag to zero for encrypted volumes (bnc#726414)
+
+-------------------------------------------------------------------
+Tue Oct 25 16:08:52 CEST 2011 - f...@suse.de
+
+- 2.21.11
+- changes to support new function IsDeviceOnNetwork in ycp
+
+-------------------------------------------------------------------
+Mon Oct 24 14:11:58 CEST 2011 - f...@suse.de
+
+- detect new transport type FcoE (bnc#726057)
+
+-------------------------------------------------------------------
Old:
----
libstorage-2.21.10.tar.bz2
New:
----
libstorage-2.21.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage.spec ++++++
--- /var/tmp/diff_new_pack.1ON3jq/_old 2011-10-28 17:10:48.000000000 +0200
+++ /var/tmp/diff_new_pack.1ON3jq/_new 2011-10-28 17:10:48.000000000 +0200
@@ -19,7 +19,7 @@
Name: libstorage
-Version: 2.21.10
+Version: 2.21.12
Release: 0
License: GPL
Group: System/Libraries
++++++ libstorage-2.21.10.tar.bz2 -> libstorage-2.21.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/VERSION
new/libstorage-2.21.12/VERSION
--- old/libstorage-2.21.10/VERSION 2011-10-20 17:57:35.000000000 +0200
+++ new/libstorage-2.21.12/VERSION 2011-10-27 13:35:05.000000000 +0200
@@ -1 +1 @@
-2.21.10
+2.21.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/bindings/python/libstorage.py
new/libstorage-2.21.12/bindings/python/libstorage.py
--- old/libstorage-2.21.10/bindings/python/libstorage.py 2011-09-13
18:43:34.000000000 +0200
+++ new/libstorage-2.21.12/bindings/python/libstorage.py 2011-10-25
17:55:14.000000000 +0200
@@ -191,6 +191,7 @@
SATA = _libstorage.SATA
SPI = _libstorage.SPI
USB = _libstorage.USB
+FCOE = _libstorage.FCOE
IMSM_UNDECIDED = _libstorage.IMSM_UNDECIDED
IMSM_DMRAID = _libstorage.IMSM_DMRAID
IMSM_MDADM = _libstorage.IMSM_MDADM
@@ -1169,6 +1170,9 @@
__swig_setmethods__["vdevice"] = _libstorage.ContVolInfo_vdevice_set
__swig_getmethods__["vdevice"] = _libstorage.ContVolInfo_vdevice_get
if _newclass:vdevice = _swig_property(_libstorage.ContVolInfo_vdevice_get,
_libstorage.ContVolInfo_vdevice_set)
+ __swig_setmethods__["num"] = _libstorage.ContVolInfo_num_set
+ __swig_getmethods__["num"] = _libstorage.ContVolInfo_num_get
+ if _newclass:num = _swig_property(_libstorage.ContVolInfo_num_get,
_libstorage.ContVolInfo_num_set)
__swig_destroy__ = _libstorage.delete_ContVolInfo
__del__ = lambda self : None;
ContVolInfo_swigregister = _libstorage.ContVolInfo_swigregister
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/bindings/ruby/storage_wrap.cxx
new/libstorage-2.21.12/bindings/ruby/storage_wrap.cxx
--- old/libstorage-2.21.10/bindings/ruby/storage_wrap.cxx 2011-09-14
11:52:11.000000000 +0200
+++ new/libstorage-2.21.12/bindings/ruby/storage_wrap.cxx 2011-10-25
17:56:02.000000000 +0200
@@ -17558,6 +17558,59 @@
}
+SWIGINTERN VALUE
+_wrap_ContVolInfo_num_set(int argc, VALUE *argv, VALUE self) {
+ storage::ContVolInfo *arg1 = (storage::ContVolInfo *) 0 ;
+ int arg2 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ int val2 ;
+ int ecode2 = 0 ;
+
+ if ((argc < 1) || (argc > 1)) {
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+ }
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_storage__ContVolInfo, 0 | 0
);
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "",
"storage::ContVolInfo *","num", 1, self ));
+ }
+ arg1 = reinterpret_cast< storage::ContVolInfo * >(argp1);
+ ecode2 = SWIG_AsVal_int(argv[0], &val2);
+ if (!SWIG_IsOK(ecode2)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "",
"int","num", 2, argv[0] ));
+ }
+ arg2 = static_cast< int >(val2);
+ if (arg1) (arg1)->num = arg2;
+ return Qnil;
+fail:
+ return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_ContVolInfo_num_get(int argc, VALUE *argv, VALUE self) {
+ storage::ContVolInfo *arg1 = (storage::ContVolInfo *) 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ int result;
+ VALUE vresult = Qnil;
+
+ if ((argc < 0) || (argc > 0)) {
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+ }
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_storage__ContVolInfo, 0 | 0
);
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "",
"storage::ContVolInfo *","num", 1, self ));
+ }
+ arg1 = reinterpret_cast< storage::ContVolInfo * >(argp1);
+ result = (int) ((arg1)->num);
+ vresult = SWIG_From_int(static_cast< int >(result));
+ return vresult;
+fail:
+ return Qnil;
+}
+
+
SWIGINTERN void
free_storage_ContVolInfo(storage::ContVolInfo *arg1) {
delete arg1;
@@ -37397,6 +37450,7 @@
rb_define_const(mStorage, "SATA", SWIG_From_int(static_cast< int
>(storage::SATA)));
rb_define_const(mStorage, "SPI", SWIG_From_int(static_cast< int
>(storage::SPI)));
rb_define_const(mStorage, "USB", SWIG_From_int(static_cast< int
>(storage::USB)));
+ rb_define_const(mStorage, "FCOE", SWIG_From_int(static_cast< int
>(storage::FCOE)));
rb_define_const(mStorage, "IMSM_UNDECIDED", SWIG_From_int(static_cast< int
>(storage::IMSM_UNDECIDED)));
rb_define_const(mStorage, "IMSM_DMRAID", SWIG_From_int(static_cast< int
>(storage::IMSM_DMRAID)));
rb_define_const(mStorage, "IMSM_MDADM", SWIG_From_int(static_cast< int
>(storage::IMSM_MDADM)));
@@ -37989,6 +38043,8 @@
rb_define_method(SwigClassContVolInfo.klass, "vname",
VALUEFUNC(_wrap_ContVolInfo_vname_get), -1);
rb_define_method(SwigClassContVolInfo.klass, "vdevice=",
VALUEFUNC(_wrap_ContVolInfo_vdevice_set), -1);
rb_define_method(SwigClassContVolInfo.klass, "vdevice",
VALUEFUNC(_wrap_ContVolInfo_vdevice_get), -1);
+ rb_define_method(SwigClassContVolInfo.klass, "num=",
VALUEFUNC(_wrap_ContVolInfo_num_set), -1);
+ rb_define_method(SwigClassContVolInfo.klass, "num",
VALUEFUNC(_wrap_ContVolInfo_num_get), -1);
SwigClassContVolInfo.mark = 0;
SwigClassContVolInfo.destroy = (void (*)(void *)) free_storage_ContVolInfo;
SwigClassContVolInfo.trackObjects = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/storage/AppUtil.cc
new/libstorage-2.21.12/storage/AppUtil.cc
--- old/libstorage-2.21.10/storage/AppUtil.cc 2011-02-28 18:50:42.000000000
+0100
+++ new/libstorage-2.21.12/storage/AppUtil.cc 2011-10-26 13:10:26.000000000
+0200
@@ -607,6 +607,11 @@
return links;
}
+map<string, string> getDirLinks(const string& dir)
+ {
+ return( getUdevLinks(dir.c_str()) );
+ }
+
UdevMap::UdevMap(const string& path)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/storage/AppUtil.h
new/libstorage-2.21.12/storage/AppUtil.h
--- old/libstorage-2.21.10/storage/AppUtil.h 2011-02-28 18:50:42.000000000
+0100
+++ new/libstorage-2.21.12/storage/AppUtil.h 2011-10-26 13:07:47.000000000
+0200
@@ -72,6 +72,8 @@
string udevEncode(const string&);
string udevDecode(const string&);
+ map<string, string> getDirLinks(const string& dir);
+
bool mkdtemp(string& path);
bool readlink(const string& path, string& buf);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/storage/Disk.cc
new/libstorage-2.21.12/storage/Disk.cc
--- old/libstorage-2.21.10/storage/Disk.cc 2011-09-05 16:42:45.000000000
+0200
+++ new/libstorage-2.21.12/storage/Disk.cc 2011-10-24 14:21:18.000000000
+0200
@@ -162,10 +162,20 @@
}
+string
+Disk::sysfsPath( const string& device )
+ {
+ string dev(device);
+ if( boost::starts_with(dev, "/dev/"))
+ dev.erase( 0, 5 );
+ return SYSFSDIR "/" + boost::replace_all_copy(dev, "/", "!");
+ }
+
+
string
Disk::sysfsPath() const
{
- return SYSFSDIR "/" + boost::replace_all_copy(procName(), "/", "!");
+ return( Disk::sysfsPath( procName() ));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/storage/Disk.h
new/libstorage-2.21.12/storage/Disk.h
--- old/libstorage-2.21.10/storage/Disk.h 2010-11-03 12:41:22.000000000
+0100
+++ new/libstorage-2.21.12/storage/Disk.h 2011-10-24 14:19:13.000000000
+0200
@@ -91,6 +91,7 @@
virtual string procName() const { return nm; }
virtual string sysfsPath() const;
+ static string sysfsPath( const string& device );
unsigned numPartitions() const;
bool isDasd() const { return( nm.find("dasd")==0 ); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/storage/Enum.cc
new/libstorage-2.21.12/storage/Enum.cc
--- old/libstorage-2.21.10/storage/Enum.cc 2011-04-05 18:01:53.000000000
+0200
+++ new/libstorage-2.21.12/storage/Enum.cc 2011-10-24 14:19:13.000000000
+0200
@@ -110,7 +110,7 @@
static const string transport_names[] = {
- "UNKNOWN", "SBP", "ATA", "FC", "iSCSI", "SAS", "SATA", "SPI", "USB"
+ "UNKNOWN", "SBP", "ATA", "FC", "iSCSI", "SAS", "SATA", "SPI", "USB",
"FCOE"
};
const vector<string> EnumInfo<Transport>::names(transport_names,
transport_names +
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/storage/Lsscsi.cc
new/libstorage-2.21.12/storage/Lsscsi.cc
--- old/libstorage-2.21.10/storage/Lsscsi.cc 2010-10-11 12:39:22.000000000
+0200
+++ new/libstorage-2.21.12/storage/Lsscsi.cc 2011-10-24 14:19:13.000000000
+0200
@@ -25,7 +25,9 @@
#include "storage/AppUtil.h"
#include "storage/SystemCmd.h"
#include "storage/StorageDefines.h"
+#include "storage/StorageTmpl.h"
#include "storage/Lsscsi.h"
+#include "storage/Disk.h"
#include "storage/Enum.h"
@@ -76,6 +78,32 @@
else if (boost::starts_with(transport, "usb:"))
entry.transport = USB;
+ if( entry.transport == FC )
+ {
+ string link;
+ if( readlink( Disk::sysfsPath(device)+"/device", link))
+ {
+ y2mil( "sysfs:" << Disk::sysfsPath(device) <<
+ " link:" << link );
+ string::size_type pos = link.rfind( '/' ) + 1;
+ string nums = link.substr( pos, link.find_first_not_of(
"0123456789", pos ));
+ unsigned num = 0;
+ nums >> num;
+ y2mil( "nums:" << nums << " num:" << num );
+ string symname = "/sys/class/fc_host/host" +
+ decString(num) + "/symbolic_name";
+ ifstream tmpf( symname.c_str() );
+ string line;
+ getline( tmpf, line );
+ y2mil( "line:" << line );
+ if( line.find( "over eth" )!=string::npos )
+ {
+ entry.transport = FCOE;
+ y2mil( "FCoE device: " << device );
+ }
+ }
+ }
+
data[device] = entry;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/storage/Md.cc
new/libstorage-2.21.12/storage/Md.cc
--- old/libstorage-2.21.10/storage/Md.cc 2010-12-07 12:37:50.000000000
+0100
+++ new/libstorage-2.21.12/storage/Md.cc 2011-10-26 13:15:03.000000000
+0200
@@ -196,6 +196,12 @@
alt_names.remove_if(string_starts_with("/dev/disk/by-id/"));
for (list<string>::const_iterator i = udev_id.begin(); i !=
udev_id.end(); ++i)
alt_names.push_back("/dev/disk/by-id/" + *i);
+ alt_names.remove_if(string_starts_with("/dev/md/"));
+ map<string,string> md = getDirLinks("/dev/md");
+ y2mil("links:" << md );
+ for( map<string,string>::const_iterator i=md.begin(); i!=md.end(); ++i )
+ if(i->second==nm)
+ alt_names.push_back("/dev/md/"+i->first);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/storage/Storage.cc
new/libstorage-2.21.12/storage/Storage.cc
--- old/libstorage-2.21.10/storage/Storage.cc 2011-10-18 17:12:11.000000000
+0200
+++ new/libstorage-2.21.12/storage/Storage.cc 2011-10-25 16:24:38.000000000
+0200
@@ -5087,11 +5087,21 @@
if (findVolume(device, c, v))
{
ret = 0;
+ if( c->type()==BTRFSC )
+ {
+ const Btrfs * b = dynamic_cast<const Btrfs *>(&(*v));
+ if( b!=NULL && b->getDevices().size()==1 )
+ {
+ findVolume(b->device(), c, v, true);
+ }
+ }
info.ctype = c->type();
info.cname = c->name();
info.cdevice = c->device();
info.vname = v->name();
info.vdevice = v->device();
+ if( v->isNumeric() )
+ info.num = v->nr();
}
else if (findContainer(device, c))
{
@@ -5720,11 +5730,11 @@
}
bool Storage::findVolume( const string& device, ConstContIterator& c,
- ConstVolIterator& v )
+ ConstVolIterator& v, bool no_btrfs )
{
ContIterator ct;
VolIterator vt;
- bool ret = findVolume( device, ct, vt );
+ bool ret = findVolume( device, ct, vt, no_btrfs );
if( ret )
{
c = ct;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/storage/Storage.h
new/libstorage-2.21.12/storage/Storage.h
--- old/libstorage-2.21.10/storage/Storage.h 2011-09-12 18:52:51.000000000
+0200
+++ new/libstorage-2.21.12/storage/Storage.h 2011-10-25 16:24:38.000000000
+0200
@@ -2051,7 +2051,7 @@
bool findVolume( const string& device, ContIterator& c,
VolIterator& v, bool no_btrfs=false );
bool findVolume( const string& device, ConstContIterator& c,
- ConstVolIterator& v );
+ ConstVolIterator& v, bool no_btrfs=false );
bool findVolume( const string& device, VolIterator& v,
bool also_del=false, bool no_btrfs=false );
bool findVolume( const string& device, ConstVolIterator& v,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/storage/StorageInterface.h
new/libstorage-2.21.12/storage/StorageInterface.h
--- old/libstorage-2.21.10/storage/StorageInterface.h 2011-09-13
16:43:33.000000000 +0200
+++ new/libstorage-2.21.12/storage/StorageInterface.h 2011-10-25
16:24:38.000000000 +0200
@@ -171,7 +171,7 @@
enum CType { CUNKNOWN, DISK, MD, LOOP, LVM, DM, DMRAID, NFSC, DMMULTIPATH,
MDPART, BTRFSC, TMPFSC };
- enum Transport { TUNKNOWN, SBP, ATA, FC, ISCSI, SAS, SATA, SPI, USB };
+ enum Transport { TUNKNOWN, SBP, ATA, FC, ISCSI, SAS, SATA, SPI, USB, FCOE
};
enum ImsmDriver { IMSM_UNDECIDED, IMSM_DMRAID, IMSM_MDADM };
@@ -614,12 +614,13 @@
*/
struct ContVolInfo
{
- ContVolInfo() : ctype(CUNKNOWN) {}
+ ContVolInfo() : ctype(CUNKNOWN), num(-1) {}
CType ctype;
string cname;
string cdevice;
string vname;
string vdevice;
+ int num;
};
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/storage/Volume.cc
new/libstorage-2.21.12/storage/Volume.cc
--- old/libstorage-2.21.10/storage/Volume.cc 2011-10-18 13:51:33.000000000
+0200
+++ new/libstorage-2.21.12/storage/Volume.cc 2011-10-26 14:08:29.000000000
+0200
@@ -2821,7 +2821,7 @@
unsigned Volume::fstabPassno() const
{
unsigned ret = 2;
- if( noFreqPassno() || (encryption!=ENC_NONE) )
+ if( noFreqPassno() )
ret = 0;
else if( mp=="/" )
ret = 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.10/testsuite/single.out/fstab3.out
new/libstorage-2.21.12/testsuite/single.out/fstab3.out
--- old/libstorage-2.21.10/testsuite/single.out/fstab3.out 2010-07-29
15:47:00.000000000 +0200
+++ new/libstorage-2.21.12/testsuite/single.out/fstab3.out 2011-10-27
15:21:38.000000000 +0200
@@ -6,7 +6,7 @@
0
0
begin of fstab
-/dev/mapper/cr_sda1 /secret ext4 nofail 0 0
+/dev/mapper/cr_sda1 /secret ext4 nofail 0 2
end of fstab
begin of crypttab
cr_sda1 /dev/sda1 none none
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
