Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-03-11 09:24:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-03-01 14:38:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-03-11 09:24:09.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 03 15:53:43 CET 2014 - [email protected] + +- fixed partition end cylinder calculation (bnc#866149) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-2.25.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/storage/Disk.cc new/libstorage-2.25.9/storage/Disk.cc --- old/libstorage-2.25.9/storage/Disk.cc 2014-02-28 15:05:13.000000000 +0100 +++ new/libstorage-2.25.9/storage/Disk.cc 2014-03-03 16:35:35.000000000 +0100 @@ -730,7 +730,10 @@ if (getDlabelCapabilities(label, caps)) maxSectors = caps.maxSectors; - unsigned long start = label == "dasd" ? 1 : 0; + unsigned long start = 0; + if (label == "mac" || label == "amiga" || label == "dasd") + start = 1; + unsigned long len = min(cylinders(), kbToCylinder(sectorToKb(maxSectors))); return Region(start, len - start); @@ -2045,7 +2048,7 @@ if( ret==0 ) { unsigned long start = p->cylStart(); - unsigned long end = p->cylStart()+p->cylSize(); + unsigned long end = p->cylEnd(); ConstPartPair pp = (p->type()!=LOGICAL) ? partPair( existingNotLog ) : partPair( existingLog ); unsigned long maxc = cylinders(); @@ -2082,7 +2085,7 @@ y2mil("corrected end from " << end << " to max " << maxc); end = maxc; } - if( start==0 && (label == "mac" || label == "amiga") ) + if (start == 0 && (label == "mac" || label == "amiga" || label == "dasd")) start = 1; string save = cmd_line.str(); y2mil( "end:" << end << " cylinders:" << cylinders() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/storage/DmCo.cc new/libstorage-2.25.9/storage/DmCo.cc --- old/libstorage-2.25.9/storage/DmCo.cc 2014-02-13 11:08:22.000000000 +0100 +++ new/libstorage-2.25.9/storage/DmCo.cc 2014-03-04 18:04:21.000000000 +0100 @@ -38,7 +38,7 @@ using namespace std; - CmdDmsetup::CmdDmsetup(bool do_probe) + CmdDmsetupInfo::CmdDmsetupInfo(bool do_probe) { if (do_probe) probe(); @@ -46,7 +46,7 @@ void - CmdDmsetup::probe() + CmdDmsetupInfo::probe() { SystemCmd c(DMSETUPBIN " --columns --separator '/' --noheadings -o name,major,minor,segments,uuid info"); if (c.retcode() == 0 && !c.stdout().empty()) @@ -55,7 +55,7 @@ void - CmdDmsetup::parse(const vector<string>& lines) + CmdDmsetupInfo::parse(const vector<string>& lines) { for (vector<string>::const_iterator it = lines.begin(); it != lines.end(); ++it) { @@ -80,7 +80,7 @@ bool - CmdDmsetup::getEntry(const string& name, Entry& entry) const + CmdDmsetupInfo::getEntry(const string& name, Entry& entry) const { const_iterator it = data.find(name); if (it == data.end()) @@ -92,7 +92,7 @@ list<string> - CmdDmsetup::getEntries() const + CmdDmsetupInfo::getEntries() const { list<string> ret; for (const_iterator i = data.begin(); i != data.end(); ++i) @@ -101,19 +101,19 @@ } - std::ostream& operator<<(std::ostream& s, const CmdDmsetup& cmddmsetup) + std::ostream& operator<<(std::ostream& s, const CmdDmsetupInfo& cmddmsetupinfo) { - for (CmdDmsetup::const_iterator it = cmddmsetup.begin(); it != cmddmsetup.end(); ++it) - s << "data[" << it->first << "] -> " << it->second << endl; + for (const CmdDmsetupInfo::value_type& it : cmddmsetupinfo) + s << "data[" << it.first << "] -> " << it.second << endl; return s; } - std::ostream& operator<<(std::ostream& s, const CmdDmsetup::Entry& entry) + std::ostream& operator<<(std::ostream& s, const CmdDmsetupInfo::Entry& entry) { - s << "name:" << entry.name << " mjr:" << entry.mjr << " mnr:" << entry.mnr << " segments:" - << entry.segments << " uuid:" << entry.uuid; + s << "mjr:" << entry.mjr << " mnr:" << entry.mnr << " segments:" << entry.segments + << " uuid:" << entry.uuid; return s; } @@ -249,10 +249,10 @@ Storage::ConstDmmultipathCoPair dmmco = getStorage()->dmmultipathCoPair(); Storage::ConstDmmultipathPair dmm = getStorage()->dmmPair(); - const CmdDmsetup& cmddmsetup = systeminfo.getCmdDmsetup(); + const CmdDmsetupInfo& cmddmsetupinfo = systeminfo.getCmdDmsetupInfo(); list<string> lvm_pools; list<string> lvm_tmeta; - for (CmdDmsetup::const_iterator it1 = cmddmsetup.begin(); it1 != cmddmsetup.end(); ++it1) + for (CmdDmsetupInfo::const_iterator it1 = cmddmsetupinfo.begin(); it1 != cmddmsetupinfo.end(); ++it1) { if( boost::ends_with(it1->first,"-tpool") ) { @@ -278,7 +278,7 @@ } y2mil( "lvm_pools:" << lvm_pools ); y2mil( "lvm_tmeta:" << lvm_tmeta ); - for (CmdDmsetup::const_iterator it1 = cmddmsetup.begin(); it1 != cmddmsetup.end(); ++it1) + for (CmdDmsetupInfo::const_iterator it1 = cmddmsetupinfo.begin(); it1 != cmddmsetupinfo.end(); ++it1) { if( boost::ends_with(it1->first,"_tdata") ) { @@ -289,7 +289,7 @@ } } y2mil( "lvm_pools:" << lvm_pools ); - for (CmdDmsetup::const_iterator it1 = cmddmsetup.begin(); it1 != cmddmsetup.end(); ++it1) + for (CmdDmsetupInfo::const_iterator it1 = cmddmsetupinfo.begin(); it1 != cmddmsetupinfo.end(); ++it1) { string table = it1->first; bool found=false; @@ -340,7 +340,7 @@ } if( !found ) { - const CmdDmsetup::Entry& entry = it1->second; + const CmdDmsetupInfo::Entry& entry = it1->second; Dm* m = new Dm(*this, table, "/dev/mapper/" + table, table, systeminfo); y2mil("new Dm:" << *m); @@ -423,11 +423,11 @@ void DmCo::getDmDataCrypt(SystemInfo& systeminfo) { y2mil( "begin:" ); - const CmdDmsetup& cmddmsetup = systeminfo.getCmdDmsetup(); - for (CmdDmsetup::const_iterator it1 = cmddmsetup.begin(); it1 != cmddmsetup.end(); ++it1) + const CmdDmsetupInfo& cmddmsetupinfo = systeminfo.getCmdDmsetupInfo(); + for (CmdDmsetupInfo::const_iterator it1 = cmddmsetupinfo.begin(); it1 != cmddmsetupinfo.end(); ++it1) { string table = it1->first; - const CmdDmsetup::Entry& entry = it1->second; + const CmdDmsetupInfo::Entry& entry = it1->second; string dev = "/dev/mapper/" + table; if( boost::starts_with(entry.uuid, "CRYPT")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/storage/DmCo.h new/libstorage-2.25.9/storage/DmCo.h --- old/libstorage-2.25.9/storage/DmCo.h 2014-02-13 11:08:22.000000000 +0100 +++ new/libstorage-2.25.9/storage/DmCo.h 2014-03-04 18:04:21.000000000 +0100 @@ -31,20 +31,19 @@ class SystemInfo; - class CmdDmsetup + class CmdDmsetupInfo { public: - CmdDmsetup(bool do_probe = true); + CmdDmsetupInfo(bool do_probe = true); void probe(); struct Entry { - Entry() : name(), mjr(0), mnr(0), segments(0), uuid() {} + Entry() : mjr(0), mnr(0), segments(0), uuid() {} - string name; unsigned long mjr; unsigned long mnr; unsigned segments; @@ -65,12 +64,13 @@ return ret; } + typedef map<string, Entry>::value_type value_type; typedef map<string, Entry>::const_iterator const_iterator; const_iterator begin() const { return data.begin(); } const_iterator end() const { return data.end(); } - friend std::ostream& operator<<(std::ostream& s, const CmdDmsetup& cmddmsetup); + friend std::ostream& operator<<(std::ostream& s, const CmdDmsetupInfo& cmddmsetupinfo); friend std::ostream& operator<<(std::ostream& s, const Entry& entry); void parse(const vector<string>& lines); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/storage/DmPartCo.cc new/libstorage-2.25.9/storage/DmPartCo.cc --- old/libstorage-2.25.9/storage/DmPartCo.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.9/storage/DmPartCo.cc 2014-03-04 18:04:21.000000000 +0100 @@ -296,8 +296,8 @@ void DmPartCo::init(SystemInfo& systeminfo) { - CmdDmsetup::Entry entry; - if (systeminfo.getCmdDmsetup().getEntry(nm, entry) && entry.segments > 0) + CmdDmsetupInfo::Entry entry; + if (systeminfo.getCmdDmsetupInfo().getEntry(nm, entry) && entry.segments > 0) { systeminfo.getProcParts().getSize("/dev/dm-" + decString(entry.mnr), size_k); y2mil("minor:" << entry.mnr << " nm:" << nm); @@ -313,7 +313,7 @@ string pat = getPartName(1); pat.erase( pat.length()-1, 1 ); string reg = "^" + pat + "[0-9]+" "$"; - list<string> tmp = systeminfo.getCmdDmsetup().getMatchingEntries(regex_matches(reg)); + list<string> tmp = systeminfo.getCmdDmsetupInfo().getMatchingEntries(regex_matches(reg)); if (tmp.empty()) activate_part(true); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/storage/DmmultipathCo.cc new/libstorage-2.25.9/storage/DmmultipathCo.cc --- old/libstorage-2.25.9/storage/DmmultipathCo.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.9/storage/DmmultipathCo.cc 2014-03-04 18:04:21.000000000 +0100 @@ -274,8 +274,8 @@ list<string> entries = systeminfo.getCmdMultipath().getEntries(); for (list<string>::const_iterator it = entries.begin(); it != entries.end(); ++it) { - CmdDmsetup::Entry entry; - if (systeminfo.getCmdDmsetup().getEntry(*it, entry) && entry.segments > 0) + CmdDmsetupInfo::Entry entry; + if (systeminfo.getCmdDmsetupInfo().getEntry(*it, entry) && entry.segments > 0) l.push_back(*it); else y2mil("ignoring inactive dmmultipath " << *it); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/storage/DmraidCo.cc new/libstorage-2.25.9/storage/DmraidCo.cc --- old/libstorage-2.25.9/storage/DmraidCo.cc 2014-01-22 18:10:01.000000000 +0100 +++ new/libstorage-2.25.9/storage/DmraidCo.cc 2014-03-04 18:04:21.000000000 +0100 @@ -257,8 +257,8 @@ list<string> entries = systeminfo.getCmdDmraid().getEntries(); for (list<string>::const_iterator it = entries.begin(); it != entries.end(); ++it) { - CmdDmsetup::Entry entry; - if (systeminfo.getCmdDmsetup().getEntry(*it, entry) && entry.segments > 0) + CmdDmsetupInfo::Entry entry; + if (systeminfo.getCmdDmsetupInfo().getEntry(*it, entry) && entry.segments > 0) l.push_back(*it); else y2mil("ignoring inactive dmraid " << *it); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/storage/Storage.cc new/libstorage-2.25.9/storage/Storage.cc --- old/libstorage-2.25.9/storage/Storage.cc 2014-02-26 18:51:02.000000000 +0100 +++ new/libstorage-2.25.9/storage/Storage.cc 2014-03-04 18:04:21.000000000 +0100 @@ -5088,25 +5088,6 @@ return( ret ); } -void Storage::updateDmEmptyPeMap() - { - VPair vp = vPair( isDmContainer ); - for( VolIterator v=vp.begin(); v!=vp.end(); ++v ) - { - Dm * dm = dynamic_cast<Dm *>(&(*v)); - if( dm!=NULL ) - { - if( dm->getPeMap().empty() ) - { - y2mil( "dm:" << *dm ); - dm->getTableInfo(); - dm->updateMajorMinor(); - } - } - else - y2war("not a Dm descendant " << v->device()); - } - } bool Storage::checkDmMapsTo( const string& dev ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/storage/Storage.h new/libstorage-2.25.9/storage/Storage.h --- old/libstorage-2.25.9/storage/Storage.h 2014-02-21 17:34:44.000000000 +0100 +++ new/libstorage-2.25.9/storage/Storage.h 2014-03-04 18:04:21.000000000 +0100 @@ -601,7 +601,6 @@ bool removeDmTable( const string& table ); bool removeDmMapsTo( const string& dev ); bool checkDmMapsTo( const string& dev ); - void updateDmEmptyPeMap(); void dumpObjectList(); void dumpCommitInfos() const; bool mountTmpRo( const Volume* vol, string& mp, const string& opts="" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/storage/SystemInfo.h new/libstorage-2.25.9/storage/SystemInfo.h --- old/libstorage-2.25.9/storage/SystemInfo.h 2014-02-24 14:59:33.000000000 +0100 +++ new/libstorage-2.25.9/storage/SystemInfo.h 2014-03-04 18:04:21.000000000 +0100 @@ -65,7 +65,7 @@ const Lsscsi& getLsscsi() { return *lsscsi; } const Parted& getParted(const string& device) { return parteds.get(device); } const Dasdview& getDasdview(const string& device) { return dasdviews.get(device); } - const CmdDmsetup& getCmdDmsetup() { return *cmddmsetup; } + const CmdDmsetupInfo& getCmdDmsetupInfo() { return *cmddmsetupinfo; } const CmdCryptsetup& getCmdCryptsetup(const string& name) { return cmdcryptsetups.get(name); } const CmdDmraid& getCmdDmraid() { return *cmddmraid; } const CmdMultipath& getCmdMultipath() { return *cmdmultipath; } @@ -123,7 +123,7 @@ LazyObject<Lsscsi> lsscsi; LazyObjects<Parted> parteds; LazyObjects<Dasdview> dasdviews; - LazyObject<CmdDmsetup> cmddmsetup; + LazyObject<CmdDmsetupInfo> cmddmsetupinfo; LazyObjects<CmdCryptsetup> cmdcryptsetups; LazyObject<CmdDmraid> cmddmraid; LazyObject<CmdMultipath> cmdmultipath; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/storage/gen_md5sum.cc new/libstorage-2.25.9/storage/gen_md5sum.cc --- old/libstorage-2.25.9/storage/gen_md5sum.cc 2014-02-28 15:05:17.000000000 +0100 +++ new/libstorage-2.25.9/storage/gen_md5sum.cc 2014-03-04 18:05:17.000000000 +0100 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "6f12a7882155867f8d04745c5a0e82d4" -#define SOURCES_MD5_DATE " Fri 28 Feb 15:05:17 CET 2014 " +#define SOURCES_MD5SUM "170c4acbbdb8bbde91f70b90b0df2b20" +#define SOURCES_MD5_DATE " Tue 4 Mar 18:05:17 CET 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/testsuite/Makefile.am new/libstorage-2.25.9/testsuite/Makefile.am --- old/libstorage-2.25.9/testsuite/Makefile.am 2014-02-20 16:09:58.000000000 +0100 +++ new/libstorage-2.25.9/testsuite/Makefile.am 2014-03-04 18:04:21.000000000 +0100 @@ -27,7 +27,7 @@ udevdecode.single udevencode.single usedby1.single userdata1.single \ uuid1.single \ blkid.single btrfs.single cryptsetup.single dasdview.single \ - dmraid.single dmsetup.single lsscsi.single mdadm-details.single \ + dmraid.single dmsetup-info.single lsscsi.single mdadm-details.single \ mdadm-examine.single parted.single proc-mdstat.single \ proc-mounts.single proc-parts.single vgdisplay.single vgs.single @@ -76,7 +76,7 @@ cryptsetup_single_SOURCES = cryptsetup.cc common.h common.cc dasdview_single_SOURCES = dasdview.cc common.h common.cc dmraid_single_SOURCES = dmraid.cc common.h common.cc -dmsetup_single_SOURCES = dmsetup.cc common.h common.cc +dmsetup_info_single_SOURCES = dmsetup-info.cc common.h common.cc lsscsi_single_SOURCES = lsscsi.cc common.h common.cc mdadm_details_single_SOURCES = mdadm-details.cc common.h common.cc mdadm_examine_single_SOURCES = mdadm-examine.cc common.h common.cc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/testsuite/Makefile.in new/libstorage-2.25.9/testsuite/Makefile.in --- old/libstorage-2.25.9/testsuite/Makefile.in 2014-02-26 18:52:19.000000000 +0100 +++ new/libstorage-2.25.9/testsuite/Makefile.in 2014-03-04 18:04:41.000000000 +0100 @@ -105,7 +105,7 @@ userdata1.single$(EXEEXT) uuid1.single$(EXEEXT) \ blkid.single$(EXEEXT) btrfs.single$(EXEEXT) \ cryptsetup.single$(EXEEXT) dasdview.single$(EXEEXT) \ - dmraid.single$(EXEEXT) dmsetup.single$(EXEEXT) \ + dmraid.single$(EXEEXT) dmsetup-info.single$(EXEEXT) \ lsscsi.single$(EXEEXT) mdadm-details.single$(EXEEXT) \ mdadm-examine.single$(EXEEXT) parted.single$(EXEEXT) \ proc-mdstat.single$(EXEEXT) proc-mounts.single$(EXEEXT) \ @@ -171,10 +171,11 @@ dmraid_single_OBJECTS = $(am_dmraid_single_OBJECTS) dmraid_single_LDADD = $(LDADD) dmraid_single_DEPENDENCIES = ../storage/libstorage.la -am_dmsetup_single_OBJECTS = dmsetup.$(OBJEXT) common.$(OBJEXT) -dmsetup_single_OBJECTS = $(am_dmsetup_single_OBJECTS) -dmsetup_single_LDADD = $(LDADD) -dmsetup_single_DEPENDENCIES = ../storage/libstorage.la +am_dmsetup_info_single_OBJECTS = dmsetup-info.$(OBJEXT) \ + common.$(OBJEXT) +dmsetup_info_single_OBJECTS = $(am_dmsetup_info_single_OBJECTS) +dmsetup_info_single_LDADD = $(LDADD) +dmsetup_info_single_DEPENDENCIES = ../storage/libstorage.la am_format1_single_OBJECTS = format1.$(OBJEXT) common.$(OBJEXT) format1_single_OBJECTS = $(am_format1_single_OBJECTS) format1_single_LDADD = $(LDADD) @@ -416,7 +417,7 @@ $(cryptsetup_single_SOURCES) $(crypttab_add_single_SOURCES) \ $(crypttab_remove_single_SOURCES) $(dasdview_single_SOURCES) \ $(disklabel1_single_SOURCES) $(dmraid_single_SOURCES) \ - $(dmsetup_single_SOURCES) $(format1_single_SOURCES) \ + $(dmsetup_info_single_SOURCES) $(format1_single_SOURCES) \ $(freeinfo1_single_SOURCES) $(fstab_add_single_SOURCES) \ $(fstab_ng_add_single_SOURCES) $(fstab_ng_find_single_SOURCES) \ $(fstab_ng_remove_single_SOURCES) \ @@ -445,7 +446,7 @@ $(cryptsetup_single_SOURCES) $(crypttab_add_single_SOURCES) \ $(crypttab_remove_single_SOURCES) $(dasdview_single_SOURCES) \ $(disklabel1_single_SOURCES) $(dmraid_single_SOURCES) \ - $(dmsetup_single_SOURCES) $(format1_single_SOURCES) \ + $(dmsetup_info_single_SOURCES) $(format1_single_SOURCES) \ $(freeinfo1_single_SOURCES) $(fstab_add_single_SOURCES) \ $(fstab_ng_add_single_SOURCES) $(fstab_ng_find_single_SOURCES) \ $(fstab_ng_remove_single_SOURCES) \ @@ -732,7 +733,7 @@ cryptsetup_single_SOURCES = cryptsetup.cc common.h common.cc dasdview_single_SOURCES = dasdview.cc common.h common.cc dmraid_single_SOURCES = dmraid.cc common.h common.cc -dmsetup_single_SOURCES = dmsetup.cc common.h common.cc +dmsetup_info_single_SOURCES = dmsetup-info.cc common.h common.cc lsscsi_single_SOURCES = lsscsi.cc common.h common.cc mdadm_details_single_SOURCES = mdadm-details.cc common.h common.cc mdadm_examine_single_SOURCES = mdadm-examine.cc common.h common.cc @@ -826,9 +827,9 @@ @rm -f dmraid.single$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(dmraid_single_OBJECTS) $(dmraid_single_LDADD) $(LIBS) -dmsetup.single$(EXEEXT): $(dmsetup_single_OBJECTS) $(dmsetup_single_DEPENDENCIES) $(EXTRA_dmsetup_single_DEPENDENCIES) - @rm -f dmsetup.single$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(dmsetup_single_OBJECTS) $(dmsetup_single_LDADD) $(LIBS) +dmsetup-info.single$(EXEEXT): $(dmsetup_info_single_OBJECTS) $(dmsetup_info_single_DEPENDENCIES) $(EXTRA_dmsetup_info_single_DEPENDENCIES) + @rm -f dmsetup-info.single$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(dmsetup_info_single_OBJECTS) $(dmsetup_info_single_LDADD) $(LIBS) format1.single$(EXEEXT): $(format1_single_OBJECTS) $(format1_single_DEPENDENCIES) $(EXTRA_format1_single_DEPENDENCIES) @rm -f format1.single$(EXEEXT) @@ -1019,7 +1020,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dasdview.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disklabel1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dmraid.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dmsetup.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dmsetup-info.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freeinfo1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstab-add.Po@am__quote@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/testsuite/dmsetup-info.cc new/libstorage-2.25.9/testsuite/dmsetup-info.cc --- old/libstorage-2.25.9/testsuite/dmsetup-info.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.9/testsuite/dmsetup-info.cc 2014-03-04 18:04:21.000000000 +0100 @@ -0,0 +1,44 @@ + +#include <iostream> + +#include "common.h" + +#include "storage/DmCo.h" + + +using namespace std; +using namespace storage; + + +void +parse1() +{ + cout << "parse1" << endl; + + vector<string> lines = { + "system-abuild/253/0/3/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRn25elwrmng2K9f1Vnfex9VFkN4tEXD8xI", + "system-test/253/7/1/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnAL4A6NByky35grIbJsJ8RYCQP0NqLsF7", + "system-testsuite/253/6/1/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRn47gLDXzm2P9srqwHhaiuUlNFmLlLJH9V", + "system-btrfs/253/5/1/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnFSGfCGnRIJQ5lNx59k7JP7uK3fkyQl48", + "system-arvin/253/1/2/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRngOeeB8at0WP8Z3sAyZv5BtKT49j6TwN6", + "system-swap/253/3/1/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnKKC5tfbWLpsF2toVKQtE0wxeQpUp8bV0", + "system-root/253/2/1/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRn89Crg8K5dO0VvjVwurvCLK4efhWCtRfN", + "system-giant--xfs/253/4/3/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnHdH1l4B0LUptYisBQuf33vP5rGosS1e2" + }; + + CmdDmsetupInfo cmddmsetupinfo(false); + cmddmsetupinfo.parse(lines); + + cout << cmddmsetupinfo << endl; +} + + +int +main() +{ + cout.setf(std::ios::boolalpha); + + setup_logger(); + + parse1(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/testsuite/dmsetup.cc new/libstorage-2.25.9/testsuite/dmsetup.cc --- old/libstorage-2.25.9/testsuite/dmsetup.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.9/testsuite/dmsetup.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ - -#include <iostream> - -#include "common.h" - -#include "storage/DmCo.h" - - -using namespace std; -using namespace storage; - - -void -parse1() -{ - cout << "parse1" << endl; - - vector<string> lines = { - "system-abuild/253/0/3/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRn25elwrmng2K9f1Vnfex9VFkN4tEXD8xI", - "system-test/253/7/1/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnAL4A6NByky35grIbJsJ8RYCQP0NqLsF7", - "system-testsuite/253/6/1/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRn47gLDXzm2P9srqwHhaiuUlNFmLlLJH9V", - "system-btrfs/253/5/1/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnFSGfCGnRIJQ5lNx59k7JP7uK3fkyQl48", - "system-arvin/253/1/2/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRngOeeB8at0WP8Z3sAyZv5BtKT49j6TwN6", - "system-swap/253/3/1/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnKKC5tfbWLpsF2toVKQtE0wxeQpUp8bV0", - "system-root/253/2/1/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRn89Crg8K5dO0VvjVwurvCLK4efhWCtRfN", - "system-giant--xfs/253/4/3/LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnHdH1l4B0LUptYisBQuf33vP5rGosS1e2" - }; - - CmdDmsetup cmddmsetup(false); - cmddmsetup.parse(lines); - - cout << cmddmsetup << endl; -} - - -int -main() -{ - cout.setf(std::ios::boolalpha); - - setup_logger(); - - parse1(); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/testsuite/single.out/dmsetup-info.out new/libstorage-2.25.9/testsuite/single.out/dmsetup-info.out --- old/libstorage-2.25.9/testsuite/single.out/dmsetup-info.out 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.9/testsuite/single.out/dmsetup-info.out 2014-03-04 18:04:21.000000000 +0100 @@ -0,0 +1,10 @@ +parse1 +data[system-abuild] -> mjr:253 mnr:0 segments:3 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRn25elwrmng2K9f1Vnfex9VFkN4tEXD8xI +data[system-arvin] -> mjr:253 mnr:1 segments:2 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRngOeeB8at0WP8Z3sAyZv5BtKT49j6TwN6 +data[system-btrfs] -> mjr:253 mnr:5 segments:1 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnFSGfCGnRIJQ5lNx59k7JP7uK3fkyQl48 +data[system-giant--xfs] -> mjr:253 mnr:4 segments:3 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnHdH1l4B0LUptYisBQuf33vP5rGosS1e2 +data[system-root] -> mjr:253 mnr:2 segments:1 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRn89Crg8K5dO0VvjVwurvCLK4efhWCtRfN +data[system-swap] -> mjr:253 mnr:3 segments:1 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnKKC5tfbWLpsF2toVKQtE0wxeQpUp8bV0 +data[system-test] -> mjr:253 mnr:7 segments:1 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnAL4A6NByky35grIbJsJ8RYCQP0NqLsF7 +data[system-testsuite] -> mjr:253 mnr:6 segments:1 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRn47gLDXzm2P9srqwHhaiuUlNFmLlLJH9V + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.9/testsuite/single.out/dmsetup.out new/libstorage-2.25.9/testsuite/single.out/dmsetup.out --- old/libstorage-2.25.9/testsuite/single.out/dmsetup.out 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.9/testsuite/single.out/dmsetup.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -parse1 -data[system-abuild] -> name: mjr:253 mnr:0 segments:3 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRn25elwrmng2K9f1Vnfex9VFkN4tEXD8xI -data[system-arvin] -> name: mjr:253 mnr:1 segments:2 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRngOeeB8at0WP8Z3sAyZv5BtKT49j6TwN6 -data[system-btrfs] -> name: mjr:253 mnr:5 segments:1 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnFSGfCGnRIJQ5lNx59k7JP7uK3fkyQl48 -data[system-giant--xfs] -> name: mjr:253 mnr:4 segments:3 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnHdH1l4B0LUptYisBQuf33vP5rGosS1e2 -data[system-root] -> name: mjr:253 mnr:2 segments:1 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRn89Crg8K5dO0VvjVwurvCLK4efhWCtRfN -data[system-swap] -> name: mjr:253 mnr:3 segments:1 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnKKC5tfbWLpsF2toVKQtE0wxeQpUp8bV0 -data[system-test] -> name: mjr:253 mnr:7 segments:1 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRnAL4A6NByky35grIbJsJ8RYCQP0NqLsF7 -data[system-testsuite] -> name: mjr:253 mnr:6 segments:1 uuid:LVM-OMPzXFm3am1zIlAVdQi5WxtmyNcevmRn47gLDXzm2P9srqwHhaiuUlNFmLlLJH9V - -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
