Hello community,
here is the log from the commit of package libstorage for openSUSE:Factory
checked in at Mon Aug 9 02:11:35 CEST 2010.
--------
--- libstorage/libstorage.changes 2010-07-23 09:54:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/libstorage/libstorage.changes 2010-08-06 11:53:41.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Aug 04 12:33:15 CEST 2010 - aschnell@suse.de
+
+- added transport type from lsscsi to hard disks
+- 2.20.1
+
+-------------------------------------------------------------------
+Thu Jul 29 12:40:44 CEST 2010 - fehr@suse.de
+
+- improve volume search when reading fstab
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libstorage-2.20.0.tar.bz2
New:
----
libstorage-2.20.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage.spec ++++++
--- /var/tmp/diff_new_pack.6QNYCQ/_old 2010-08-09 02:11:23.000000000 +0200
+++ /var/tmp/diff_new_pack.6QNYCQ/_new 2010-08-09 02:11:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libstorage (Version 2.20.0)
+# spec file for package libstorage (Version 2.20.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: libstorage
-Version: 2.20.0
+Version: 2.20.1
Release: 1
License: GPL
Group: System/Libraries
@@ -32,7 +32,7 @@
BuildRequires: blocxx-devel boost-devel dejagnu doxygen gcc-c++ libxml2-devel python-devel swig
Requires: parted >= 2.2 mdadm device-mapper lvm2 dmraid multipath-tools cryptsetup
-Requires: coreutils udev util-linux >= 2.16 grep
+Requires: coreutils udev util-linux >= 2.16 grep lsscsi
%ifarch s390 s390x
Requires: s390-tools
%endif
++++++ libstorage-2.20.0.tar.bz2 -> libstorage-2.20.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/VERSION new/libstorage-2.20.1/VERSION
--- old/libstorage-2.20.0/VERSION 2010-07-06 15:38:20.000000000 +0200
+++ new/libstorage-2.20.1/VERSION 2010-08-06 11:49:26.000000000 +0200
@@ -1 +1 @@
-2.20.0
+2.20.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/bindings/python/libstorage.py new/libstorage-2.20.1/bindings/python/libstorage.py
--- old/libstorage-2.20.0/bindings/python/libstorage.py 2010-07-23 09:52:44.000000000 +0200
+++ new/libstorage-2.20.1/bindings/python/libstorage.py 2010-08-06 11:48:30.000000000 +0200
@@ -180,6 +180,15 @@
DMMULTIPATH = _libstorage.DMMULTIPATH
MDPART = _libstorage.MDPART
COTYPE_LAST_ENTRY = _libstorage.COTYPE_LAST_ENTRY
+TUNKNOWN = _libstorage.TUNKNOWN
+SBP = _libstorage.SBP
+ATA = _libstorage.ATA
+FC = _libstorage.FC
+ISCSI = _libstorage.ISCSI
+SAS = _libstorage.SAS
+SATA = _libstorage.SATA
+SPI = _libstorage.SPI
+USB = _libstorage.USB
IMSM_UNDECIDED = _libstorage.IMSM_UNDECIDED
IMSM_DMRAID = _libstorage.IMSM_DMRAID
IMSM_MDADM = _libstorage.IMSM_MDADM
@@ -411,6 +420,9 @@
__swig_setmethods__["initDisk"] = _libstorage.DiskInfo_initDisk_set
__swig_getmethods__["initDisk"] = _libstorage.DiskInfo_initDisk_get
if _newclass:initDisk = _swig_property(_libstorage.DiskInfo_initDisk_get, _libstorage.DiskInfo_initDisk_set)
+ __swig_setmethods__["transport"] = _libstorage.DiskInfo_transport_set
+ __swig_getmethods__["transport"] = _libstorage.DiskInfo_transport_get
+ if _newclass:transport = _swig_property(_libstorage.DiskInfo_transport_get, _libstorage.DiskInfo_transport_set)
__swig_setmethods__["iscsi"] = _libstorage.DiskInfo_iscsi_set
__swig_getmethods__["iscsi"] = _libstorage.DiskInfo_iscsi_get
if _newclass:iscsi = _swig_property(_libstorage.DiskInfo_iscsi_get, _libstorage.DiskInfo_iscsi_set)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/libstorage.spec.in new/libstorage-2.20.1/libstorage.spec.in
--- old/libstorage-2.20.0/libstorage.spec.in 2010-04-26 18:07:13.000000000 +0200
+++ new/libstorage-2.20.1/libstorage.spec.in 2010-08-04 12:08:18.000000000 +0200
@@ -17,7 +17,7 @@
BuildRequires: gcc-c++ boost-devel blocxx-devel doxygen dejagnu python-devel swig libxml2-devel
Requires: parted >= 2.2 mdadm device-mapper lvm2 dmraid multipath-tools cryptsetup
-Requires: coreutils udev util-linux >= 2.16 grep
+Requires: coreutils udev util-linux >= 2.16 grep lsscsi
%ifarch s390 s390x
Requires: s390-tools
%endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/Blkid.cc new/libstorage-2.20.1/storage/Blkid.cc
--- old/libstorage-2.20.0/storage/Blkid.cc 2009-11-26 10:49:14.000000000 +0100
+++ new/libstorage-2.20.1/storage/Blkid.cc 2010-08-04 16:41:16.000000000 +0200
@@ -22,7 +22,6 @@
#include "storage/AppUtil.h"
#include "storage/SystemCmd.h"
-#include "storage/StorageTmpl.h"
#include "storage/StorageDefines.h"
#include "storage/Blkid.h"
#include "storage/Volume.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/Dasd.cc new/libstorage-2.20.1/storage/Dasd.cc
--- old/libstorage-2.20.0/storage/Dasd.cc 2010-05-11 12:51:49.000000000 +0200
+++ new/libstorage-2.20.1/storage/Dasd.cc 2010-08-06 11:47:42.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) [2004-2009] Novell, Inc.
+ * Copyright (c) [2004-2010] Novell, Inc.
*
* All Rights Reserved.
*
@@ -297,15 +297,6 @@
y2mil("c:" << c << " h:" << h << " s:" << s);
}
-bool Dasd::detectGeometry()
- {
- Disk::detectGeometry();
- sector *= 8;
- byte_cyl *= 8;
- cyl /= 8;
- y2mil("cyl:" << cyl << " sector:" << sector << " byte_cyl:" << byte_cyl);
- return( true );
- }
int Dasd::doResize( Volume* v )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/Dasd.h new/libstorage-2.20.1/storage/Dasd.h
--- old/libstorage-2.20.0/storage/Dasd.h 2010-02-26 15:11:21.000000000 +0100
+++ new/libstorage-2.20.1/storage/Dasd.h 2010-08-06 11:47:42.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) [2004-2009] Novell, Inc.
+ * Copyright (c) [2004-2010] Novell, Inc.
*
* All Rights Reserved.
*
@@ -59,7 +59,6 @@
void getToCommit(storage::CommitStage stage, list& col,
list& vol) const;
int commitChanges( storage::CommitStage stage );
- bool detectGeometry();
protected:
enum DasdFormat { DASDF_NONE, DASDF_LDL, DASDF_CDL };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/Disk.cc new/libstorage-2.20.1/storage/Disk.cc
--- old/libstorage-2.20.0/storage/Disk.cc 2010-07-06 15:38:20.000000000 +0200
+++ new/libstorage-2.20.1/storage/Disk.cc 2010-08-06 11:47:42.000000000 +0200
@@ -51,11 +51,16 @@
Disk::Disk(Storage* s, const string& name, const string& device,
unsigned long long SizeK, SystemInfo& systeminfo)
: Container(s, name, device, staticType(), systeminfo), logical_sector_size(512),
- init_disk(false), iscsi(false), dmp_slave(false), no_addpart(false),
+ init_disk(false), transport(TUNKNOWN), dmp_slave(false), no_addpart(false),
gpt_enlarge(false), del_ptable(false)
{
logfile_name = boost::replace_all_copy(nm, "/", "_");
getMajorMinor();
+
+ Lsscsi::Entry entry;
+ if (systeminfo.getLsscsi().getEntry(device, entry))
+ transport = entry.transport;
+
size_k = SizeK;
y2deb("constructed Disk name:" << name);
}
@@ -64,7 +69,7 @@
Disk::Disk(Storage* s, const string& name, const string& device, unsigned num,
unsigned long long SizeK, SystemInfo& systeminfo)
: Container(s, name, device, staticType(), systeminfo), logical_sector_size(512),
- init_disk(false), iscsi(false), dmp_slave(false), no_addpart(false),
+ init_disk(false), transport(TUNKNOWN), dmp_slave(false), no_addpart(false),
gpt_enlarge(false), del_ptable(false)
{
y2mil("constructed Disk name:" << name << " nr " << num << " sizeK:" << SizeK);
@@ -84,7 +89,7 @@
head(0), sector(0),
new_cyl(0), new_head(0), new_sector(0), label(), udev_path(),
udev_id(), max_primary(0), ext_possible(false), max_logical(0),
- init_disk(false), iscsi(false), dmp_slave(false), no_addpart(false),
+ init_disk(false), transport(TUNKNOWN), dmp_slave(false), no_addpart(false),
gpt_enlarge(false), byte_cyl(0), range(4), del_ptable(false)
{
logfile_name = nm;
@@ -120,7 +125,7 @@
detected_label(c.detected_label), logfile_name(c.logfile_name),
max_primary(c.max_primary),
ext_possible(c.ext_possible), max_logical(c.max_logical),
- init_disk(c.init_disk), iscsi(c.iscsi),
+ init_disk(c.init_disk), transport(c.transport),
dmp_slave(c.dmp_slave), no_addpart(c.no_addpart),
gpt_enlarge(c.gpt_enlarge), byte_cyl(c.byte_cyl), range(c.range),
del_ptable(c.del_ptable)
@@ -169,6 +174,9 @@
if (!udev_id.empty())
setChildValue(node, "udev_id", udev_id);
+ if (transport != TUNKNOWN)
+ setChildValue(node, "transport", Lsscsi::transport_names[transport]);
+
ConstPartPair vp = partPair();
for (ConstPartIter v = vp.begin(); v != vp.end(); ++v)
v->saveData(xmlNewChild(node, "partition"));
@@ -352,13 +360,6 @@
range = sysfsinfo.range;
if (range <= 1)
ret = false;
-
- string link;
- if (readlink(sysfsPath(), link))
- {
- y2mil("link:" << link);
- iscsi = boost::contains(link, "/session");
- }
}
else
{
@@ -366,7 +367,7 @@
}
y2mil("dev:" << dev << " ret:" << ret << " range:" << range << " major:" << mjr <<
- " minor:" << mnr << " iscsi:" << iscsi);
+ " minor:" << mnr);
return ret;
}
@@ -2821,7 +2822,8 @@
info.extendedPossible = extendedPossible();
info.maxLogical = maxLogical();
info.initDisk = init_disk;
- info.iscsi = iscsi;
+ info.iscsi = transport == ISCSI;
+ info.transport = transport;
tinfo = info;
}
@@ -2846,8 +2848,7 @@
s << " ExtPossible MaxLogical:" << d.max_logical;
if( d.init_disk )
s << " InitDisk";
- if( d.iscsi )
- s << " iSCSI";
+ s << " transport:" << Lsscsi::transport_names[d.transport];
if( d.dmp_slave )
s << " DmpSlave";
if( d.no_addpart )
@@ -2900,12 +2901,10 @@
else
log += " InitDisk-->";
}
- if( iscsi!=p->iscsi )
+ if (transport != p->transport)
{
- if( p->iscsi )
- log += " -->iSCSI";
- else
- log += " iSCSI-->";
+ log += " transport:" + Lsscsi::transport_names[transport] + "-->" +
+ Lsscsi::transport_names[p->transport];
}
if (del_ptable != p->del_ptable)
{
@@ -2964,7 +2963,7 @@
size_k==p->size_k && max_primary==p->max_primary &&
ext_possible==p->ext_possible && max_logical==p->max_logical &&
init_disk==p->init_disk && label==p->label &&
- iscsi==p->iscsi &&
+ transport == p->transport &&
dmp_slave==p->dmp_slave && no_addpart==p->no_addpart &&
gpt_enlarge==p->gpt_enlarge && del_ptable == p->del_ptable;
if( ret && p )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/Disk.h new/libstorage-2.20.1/storage/Disk.h
--- old/libstorage-2.20.0/storage/Disk.h 2010-07-06 15:38:20.000000000 +0200
+++ new/libstorage-2.20.1/storage/Disk.h 2010-08-06 11:47:42.000000000 +0200
@@ -92,7 +92,7 @@
unsigned numPartitions() const;
bool isDasd() const { return( nm.find("dasd")==0 ); }
- bool isIScsi() const { return iscsi; }
+ bool isIScsi() const { return transport == ISCSI; }
static bool isIScsi(const Disk& d) { return d.isIScsi(); }
bool isLogical( unsigned nr ) const;
bool detect(SystemInfo& systeminfo);
@@ -291,7 +291,7 @@
bool ext_possible;
unsigned max_logical;
bool init_disk;
- bool iscsi;
+ Transport transport;
bool dmp_slave;
bool no_addpart;
bool gpt_enlarge;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/Lsscsi.cc new/libstorage-2.20.1/storage/Lsscsi.cc
--- old/libstorage-2.20.0/storage/Lsscsi.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/libstorage-2.20.1/storage/Lsscsi.cc 2010-08-05 12:09:16.000000000 +0200
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2010 Novell, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may
+ * find current contact information at www.novell.com.
+ */
+
+
+#include
+
+#include "storage/AppUtil.h"
+#include "storage/SystemCmd.h"
+#include "storage/StorageDefines.h"
+#include "storage/Lsscsi.h"
+
+
+namespace storage
+{
+ using namespace std;
+
+
+ Lsscsi::Lsscsi()
+ {
+ SystemCmd cmd(LSSCSIBIN " --transport");
+ if (cmd.retcode() == 0)
+ parse(cmd.stdout());
+ }
+
+
+ void
+ Lsscsi::parse(const vector<string>& lines)
+ {
+ data.clear();
+
+ for (vector<string>::const_iterator it = lines.begin(); it != lines.end(); ++it)
+ {
+ string transport = extractNthWord(2, *it);
+ string device = extractNthWord(3, *it);
+
+ if (!boost::starts_with(device, "/dev/"))
+ continue;
+
+ Entry entry;
+
+ if (boost::starts_with(transport, "sbp:"))
+ entry.transport = SBP;
+ else if (boost::starts_with(transport, "ata:"))
+ entry.transport = ATA;
+ else if (boost::starts_with(transport, "fc:"))
+ entry.transport = FC;
+ else if (boost::starts_with(transport, "iqn"))
+ entry.transport = ISCSI;
+ else if (boost::starts_with(transport, "sas:"))
+ entry.transport = SAS;
+ else if (boost::starts_with(transport, "sata:"))
+ entry.transport = SATA;
+ else if (boost::starts_with(transport, "spi:"))
+ entry.transport = SPI;
+ else if (boost::starts_with(transport, "usb:"))
+ entry.transport = USB;
+
+ data[device] = entry;
+ }
+
+ for (const_iterator it = data.begin(); it != data.end(); ++it)
+ y2mil("data[" << it->first << "] -> " << it->second);
+ }
+
+
+ bool
+ Lsscsi::getEntry(const string& device, Entry& entry) const
+ {
+ const_iterator i = data.find(device);
+ if (i == data.end())
+ return false;
+
+ entry = i->second;
+ return true;
+ }
+
+
+ std::ostream& operator<<(std::ostream& s, const Lsscsi::Entry& entry)
+ {
+ s << "transport:" << Lsscsi::transport_names[entry.transport];
+
+ return s;
+ }
+
+
+ const string Lsscsi::transport_names[] = { "UNKNOWN", "SBP", "ATA", "FC", "iSCSI", "SAS",
+ "SATA", "SPI", "USB" };
+
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/Lsscsi.h new/libstorage-2.20.1/storage/Lsscsi.h
--- old/libstorage-2.20.0/storage/Lsscsi.h 1970-01-01 01:00:00.000000000 +0100
+++ new/libstorage-2.20.1/storage/Lsscsi.h 2010-08-04 17:07:58.000000000 +0200
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2010 Novell, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may
+ * find current contact information at www.novell.com.
+ */
+
+
+#ifndef LSSCSI_H
+#define LSSCSI_H
+
+#include <string>
+#include <map>
+#include <vector>
+
+#include "storage/StorageInterface.h"
+
+
+namespace storage
+{
+ using std::map;
+ using std::vector;
+
+
+ class Lsscsi
+ {
+ public:
+
+ Lsscsi();
+
+ struct Entry
+ {
+ Entry() : transport(TUNKNOWN) {}
+
+ Transport transport;
+ };
+
+ friend std::ostream& operator<<(std::ostream& s, const Entry& entry);
+
+ bool getEntry(const string& device, Entry& entry) const;
+
+ static const string transport_names[storage::USB + 1];
+
+ protected:
+
+ void parse(const vector<string>& lines);
+
+ typedef map::const_iterator const_iterator;
+
+ map data;
+
+ };
+
+}
+
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/Makefile.am new/libstorage-2.20.1/storage/Makefile.am
--- old/libstorage-2.20.0/storage/Makefile.am 2010-07-23 09:51:30.000000000 +0200
+++ new/libstorage-2.20.1/storage/Makefile.am 2010-08-04 11:54:00.000000000 +0200
@@ -44,6 +44,7 @@
SystemInfo.cc SystemInfo.h \
ProcParts.cc ProcParts.h \
Blkid.cc Blkid.h \
+ Lsscsi.cc Lsscsi.h \
ProcMounts.cc ProcMounts.h \
EtcFstab.cc EtcFstab.h \
EtcMdadm.cc EtcMdadm.h \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/Makefile.in new/libstorage-2.20.1/storage/Makefile.in
--- old/libstorage-2.20.0/storage/Makefile.in 2010-07-23 09:51:47.000000000 +0200
+++ new/libstorage-2.20.1/storage/Makefile.in 2010-08-06 11:52:12.000000000 +0200
@@ -80,8 +80,9 @@
Dmraid.lo Dmmultipath.lo Md.lo MdPart.lo Loop.lo Nfs.lo \
HumanString.lo Graph.lo SystemCmd.lo OutputProcessor.lo \
Regex.lo FreeInfo.lo ArchInfo.lo AsciiFile.lo XmlFile.lo \
- SystemInfo.lo ProcParts.lo Blkid.lo ProcMounts.lo EtcFstab.lo \
- EtcMdadm.lo AppUtil.lo Lock.lo StorageTypes.lo Region.lo
+ SystemInfo.lo ProcParts.lo Blkid.lo Lsscsi.lo ProcMounts.lo \
+ EtcFstab.lo EtcMdadm.lo AppUtil.lo Lock.lo StorageTypes.lo \
+ Region.lo
libstorage_la_OBJECTS = $(am_libstorage_la_OBJECTS)
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -307,6 +308,7 @@
SystemInfo.cc SystemInfo.h \
ProcParts.cc ProcParts.h \
Blkid.cc Blkid.h \
+ Lsscsi.cc Lsscsi.h \
ProcMounts.cc ProcMounts.h \
EtcFstab.cc EtcFstab.h \
EtcMdadm.cc EtcMdadm.h \
@@ -423,6 +425,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Lock.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Loop.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LoopCo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Lsscsi.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LvmLv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LvmVg.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Md.Plo@am__quote@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/Md.cc new/libstorage-2.20.1/storage/Md.cc
--- old/libstorage-2.20.0/storage/Md.cc 2010-07-23 09:51:30.000000000 +0200
+++ new/libstorage-2.20.1/storage/Md.cc 2010-08-05 09:57:29.000000000 +0200
@@ -22,7 +22,6 @@
#include <sstream>
#include
-#include
#include "storage/Md.h"
#include "storage/StorageTypes.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/Storage.cc new/libstorage-2.20.1/storage/Storage.cc
--- old/libstorage-2.20.0/storage/Storage.cc 2010-07-23 09:51:30.000000000 +0200
+++ new/libstorage-2.20.1/storage/Storage.cc 2010-08-06 11:47:42.000000000 +0200
@@ -6293,7 +6293,7 @@
info.fstab_options = boost::join( i->opts, "," );
s_infos.push_back(info);
}
- else if( findVolume( i->dentry, vol ) )
+ else if( findVolume( i->dentry, vol )||findVolume( i->device, vol ) )
{
VolumeInfo info;
vol->getInfo( info );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/StorageDefines.h new/libstorage-2.20.1/storage/StorageDefines.h
--- old/libstorage-2.20.0/storage/StorageDefines.h 2010-04-13 12:28:10.000000000 +0200
+++ new/libstorage-2.20.1/storage/StorageDefines.h 2010-08-04 11:52:37.000000000 +0200
@@ -70,6 +70,7 @@
#define BLKIDBIN "/sbin/blkid"
#define BLOCKDEVBIN "/sbin/blockdev"
+#define LSSCSIBIN "/usr/bin/lsscsi"
#define LSBIN "/bin/ls"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/StorageInterface.h new/libstorage-2.20.1/storage/StorageInterface.h
--- old/libstorage-2.20.0/storage/StorageInterface.h 2010-07-23 09:51:30.000000000 +0200
+++ new/libstorage-2.20.1/storage/StorageInterface.h 2010-08-06 11:47:42.000000000 +0200
@@ -160,6 +160,8 @@
enum CType { CUNKNOWN, DISK, MD, LOOP, LVM, DM, DMRAID, NFSC, DMMULTIPATH, MDPART,
COTYPE_LAST_ENTRY };
+ enum Transport { TUNKNOWN, SBP, ATA, FC, ISCSI, SAS, SATA, SPI, USB };
+
enum ImsmDriver { IMSM_UNDECIDED, IMSM_DMRAID, IMSM_MDADM };
enum PartAlign { ALIGN_OPTIMAL, ALIGN_CYLINDER };
@@ -298,7 +300,8 @@
bool extendedPossible;
unsigned maxLogical;
bool initDisk;
- bool iscsi;
+ Transport transport;
+ bool iscsi; // deprecated
};
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.20.0/storage/SystemInfo.h new/libstorage-2.20.1/storage/SystemInfo.h
--- old/libstorage-2.20.0/storage/SystemInfo.h 2010-02-01 22:32:38.000000000 +0100
+++ new/libstorage-2.20.1/storage/SystemInfo.h 2010-08-04 11:56:18.000000000 +0200
@@ -29,6 +29,7 @@
#include "storage/ProcParts.h"
#include "storage/ProcMounts.h"
#include "storage/Blkid.h"
+#include "storage/Lsscsi.h"
#include "storage/DmCo.h"
#include "storage/DmraidCo.h"
#include "storage/DmmultipathCo.h"
@@ -49,6 +50,7 @@
const ProcParts& getProcParts() { return *procparts; }
const ProcMounts& getProcMounts() { return *procmounts; }
const Blkid& getBlkid() { return *blkid; }
+ const Lsscsi& getLsscsi() { return *lsscsi; }
const CmdDmsetup& getCmdDmsetup() { return *cmddmsetup; }
const CmdDmraid& getCmdDmraid() { return *cmddmraid; }
const CmdMultipath& getCmdMultipath() { return *cmdmultipath; }
@@ -76,6 +78,7 @@
LazyObject<ProcParts> procparts;
LazyObject<ProcMounts> procmounts;
LazyObject<Blkid> blkid;
+ LazyObject<Lsscsi> lsscsi;
LazyObject<CmdDmsetup> cmddmsetup;
LazyObject<CmdDmraid> cmddmraid;
LazyObject<CmdMultipath> cmdmultipath;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org