Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-02-07 16:44:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-29 07:16:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-02-07 16:44:17.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Feb 06 10:48:08 CET 2014 - [email protected] + +- allow to set filesystem label for mounted btrfs (see bnc#862409) + +------------------------------------------------------------------- +Wed Feb 05 18:47:14 CET 2014 - [email protected] + +- fixed package obsoletes (bnc#861747) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.nTA3uK/_old 2014-02-07 16:44:18.000000000 +0100 +++ /var/tmp/diff_new_pack.nTA3uK/_new 2014-02-07 16:44:18.000000000 +0100 @@ -136,9 +136,9 @@ PreReq: %fillup_prereq %endif Obsoletes: yast2-storage-lib -Provides: yast2-storage-lib -Obsoletes: libstorage < 2.21.2 -Provides: libstorage = %{version} +# expands to Obsoletes: libstorage1 libstorage2 libstorage3... +Obsoletes: libstorage5 < %{version} +Obsoletes: %(echo `seq -s " " -f "libstorage%.f" $((5 - 1))`) Summary: Library for storage management Group: System/Libraries ++++++ libstorage-2.25.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/libstorage.spec.in new/libstorage-2.25.7/libstorage.spec.in --- old/libstorage-2.25.7/libstorage.spec.in 2014-01-22 17:47:03.000000000 +0100 +++ new/libstorage-2.25.7/libstorage.spec.in 2014-02-06 10:29:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libstorage # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -128,9 +128,9 @@ PreReq: %fillup_prereq %endif Obsoletes: yast2-storage-lib -Provides: yast2-storage-lib -Obsoletes: libstorage < 2.21.2 -Provides: libstorage = %{version} +# expands to Obsoletes: libstorage1 libstorage2 libstorage3... +Obsoletes: %(echo `seq -s " " -f "libstorage%.f" $((@LIBVERSION_MAJOR@ - 1))`) +Obsoletes: libstorage@LIBVERSION_MAJOR@ < %{version} Summary: Library for storage management Group: System/Libraries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/storage/Dasdview.cc new/libstorage-2.25.7/storage/Dasdview.cc --- old/libstorage-2.25.7/storage/Dasdview.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.7/storage/Dasdview.cc 2014-02-03 10:49:03.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2004-2010] Novell, Inc. + * Copyright (c) [2004-2014] Novell, Inc. * * All Rights Reserved. * @@ -28,38 +28,22 @@ namespace storage { - Dasdview::Dasdview(const string& device) - : dasd_format(Dasd::DASDF_NONE), dasd_type(Dasd::DASDTYPE_NONE) + Dasdview::Dasdview(const string& device, bool do_probe) + : device(device), dasd_format(Dasd::DASDF_NONE), dasd_type(Dasd::DASDTYPE_NONE) + { + if (do_probe) + probe(); + } + + + void + Dasdview::probe() { SystemCmd cmd(DASDVIEWBIN " --extended " + quote(device)); if (cmd.retcode() == 0) { - if (cmd.select("^format") > 0) - { - string tmp = cmd.getLine(0, true); - y2mil("Format line:" << tmp); - tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); - tmp = boost::to_lower_copy(extractNthWord(4, tmp), locale::classic()); - if( tmp == "cdl" ) - dasd_format = Dasd::DASDF_CDL; - else if( tmp == "ldl" ) - dasd_format = Dasd::DASDF_LDL; - } - - if (cmd.select("^type") > 0) - { - string tmp = cmd.getLine(0, true); - y2mil("Type line:" << tmp); - tmp = tmp.erase(0, tmp.find(':') + 1); - tmp = extractNthWord(0, tmp); - if (tmp == "ECKD") - dasd_type = Dasd::DASDTYPE_ECKD; - else if (tmp == "FBA") - dasd_type = Dasd::DASDTYPE_FBA; - } - - scanGeometry(cmd); + parse(cmd.stdout()); } else { @@ -69,50 +53,85 @@ geometry.sectors = 12; geometry.sector_size = 4096; } - - y2mil("device: " << device << " geometry:" << geometry << " dasd_format:" << - toString(dasd_format)); } void - Dasdview::scanGeometry(SystemCmd& cmd) + Dasdview::parse(const vector<string>& lines) { - if (cmd.select("number of cylinders") > 0) + vector<string>::const_iterator pos; + + pos = find_if(lines, string_starts_with("format")); + if (pos != lines.end()) { - string tmp = cmd.getLine(0, true); - y2mil("Cylinder line:" << tmp); - tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); - tmp = extractNthWord( 3, tmp ); + y2mil("Format line:" << *pos); + string tmp = string(*pos, pos->find(':') + 1); + tmp = extractNthWord(4, tmp); + if (tmp == "CDL") + dasd_format = Dasd::DASDF_CDL; + else if (tmp == "LDL") + dasd_format = Dasd::DASDF_LDL; + } + + pos = find_if(lines, string_starts_with("type")); + if (pos != lines.end()) + { + y2mil("Type line:" << *pos); + string tmp = string(*pos, pos->find(':') + 1); + tmp = extractNthWord(0, tmp); + if (tmp == "ECKD") + dasd_type = Dasd::DASDTYPE_ECKD; + else if (tmp == "FBA") + dasd_type = Dasd::DASDTYPE_FBA; + } + + pos = find_if(lines, string_starts_with("number of cylinders")); + if (pos != lines.end()) + { + y2mil("Cylinder line:" << *pos); + string tmp = string(*pos, pos->find(':') + 1); + tmp = extractNthWord(3, tmp); tmp >> geometry.cylinders; } - if (cmd.select("tracks per cylinder") > 0) + pos = find_if(lines, string_starts_with("tracks per cylinder")); + if (pos != lines.end()) { - string tmp = cmd.getLine(0, true); - y2mil("Tracks line:" << tmp); - tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); - tmp = extractNthWord( 3, tmp ); + y2mil("Tracks line:" << *pos); + string tmp = string(*pos, pos->find(':') + 1); + tmp = extractNthWord(3, tmp); tmp >> geometry.heads; } - if (cmd.select("blocks per track") > 0) + pos = find_if(lines, string_starts_with("blocks per track")); + if (pos != lines.end()) { - string tmp = cmd.getLine(0, true); - y2mil("Blocks line:" << tmp); - tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); - tmp = extractNthWord( 3, tmp ); + y2mil("Blocks line:" << *pos); + string tmp = string(*pos, pos->find(':') + 1); + tmp = extractNthWord(3, tmp); tmp >> geometry.sectors; } - if (cmd.select("blocksize") > 0) + pos = find_if(lines, string_starts_with("blocksize")); + if (pos != lines.end()) { - string tmp = cmd.getLine(0, true); - y2mil("Bytes line:" << tmp); - tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); - tmp = extractNthWord( 3, tmp ); + y2mil("Bytes line:" << *pos); + string tmp = string(*pos, pos->find(':') + 1); + tmp = extractNthWord(3, tmp); tmp >> geometry.sector_size; } + + y2mil(*this); + } + + + std::ostream& operator<<(std::ostream& s, const Dasdview& dasdview) + { + s << "device: " << dasdview.device << " geometry:" << dasdview.geometry + << " dasd_format:" << toString(dasdview.dasd_format) << " dasd_type:" + << toString(dasdview.dasd_type); + + return s; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/storage/Dasdview.h new/libstorage-2.25.7/storage/Dasdview.h --- old/libstorage-2.25.7/storage/Dasdview.h 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.7/storage/Dasdview.h 2014-02-03 10:49:03.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2004-2010] Novell, Inc. + * Copyright (c) [2004-2014] Novell, Inc. * * All Rights Reserved. * @@ -38,20 +38,25 @@ public: - Dasdview(const string& device); + Dasdview(const string& device, bool do_probe = true); + + void probe(); + + friend std::ostream& operator<<(std::ostream& s, const Dasdview& dasdview); const Geometry& getGeometry() const { return geometry; } Dasd::DasdFormat getDasdFormat() const { return dasd_format; } Dasd::DasdType getDasdType() const { return dasd_type; } + void parse(const vector<string>& lines); + private: + string device; Geometry geometry; Dasd::DasdFormat dasd_format; Dasd::DasdType dasd_type; - void scanGeometry(SystemCmd& cmd); - }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/storage/Parted.cc new/libstorage-2.25.7/storage/Parted.cc --- old/libstorage-2.25.7/storage/Parted.cc 2014-01-27 16:05:21.000000000 +0100 +++ new/libstorage-2.25.7/storage/Parted.cc 2014-02-04 09:39:54.000000000 +0100 @@ -69,7 +69,7 @@ label = extractNthWord(2, *pos); if (label == "unknown") label.clear(); - else if(label == LABEL_GPT_SYNC_MBR) + else if (label == LABEL_GPT_SYNC_MBR) label = "gpt"; } else @@ -155,7 +155,12 @@ std::ostream& operator<<(std::ostream& s, const Parted& parted) { s << "device:" << parted.device << " label:" << parted.label << " geometry:" - << parted.geometry << " gpt_enlarge:" << parted.gpt_enlarge << endl; + << parted.geometry; + + if (parted.gpt_enlarge) + s << " gpt_enlarge"; + + s << endl; for (Parted::const_iterator it = parted.entries.begin(); it != parted.entries.end(); ++it) s << *it << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/storage/Storage.cc new/libstorage-2.25.7/storage/Storage.cc --- old/libstorage-2.25.7/storage/Storage.cc 2014-01-24 17:23:02.000000000 +0100 +++ new/libstorage-2.25.7/storage/Storage.cc 2014-02-06 11:13:50.000000000 +0100 @@ -5776,7 +5776,7 @@ true, 16, 32*1024); static FsCapabilitiesX btrfsCaps (true, true, true, true, true, true, - false, 256, 256*1024); + true, 256, 256*1024); static FsCapabilitiesX xfsCaps (true, true, false, false, true, true, false, 12, 40*1024); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/storage/StorageInterface.h new/libstorage-2.25.7/storage/StorageInterface.h --- old/libstorage-2.25.7/storage/StorageInterface.h 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.7/storage/StorageInterface.h 2014-02-03 15:15:37.000000000 +0100 @@ -1398,9 +1398,9 @@ virtual int destroyPartitionTable (const string& disk, const string& label) = 0; /** - * Do a what is needed for low level initialisation of a Disk. - * This function does nothing on normal disks but is needed e.g. on S390 - * DASD devices where it executes a dasdfmt. If should be considered as + * Do what is needed for low level initialisation of a disk. This + * function does nothing on normal disks but is needed e.g. on S/390 + * DASD devices where it executes dasdfmt. If should be considered as * destroying all data on the disk. * * @param disk device name of disk, e.g. /dev/hda diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/storage/Volume.cc new/libstorage-2.25.7/storage/Volume.cc --- old/libstorage-2.25.7/storage/Volume.cc 2014-01-23 14:42:45.000000000 +0100 +++ new/libstorage-2.25.7/storage/Volume.cc 2014-02-06 11:13:50.000000000 +0100 @@ -2622,7 +2622,11 @@ cmd += " " + quote(mountDevice()); break; case BTRFS: - cmd = BTRFSBIN " filesystem label " + quote(mountDevice()); + cmd = BTRFSBIN " filesystem label "; + if (is_mounted) + cmd += quote(getStorage()->prependRoot(orig_mp)); + else + cmd += quote(mountDevice()); cmd += " " + quote(label); break; case NTFS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/storage/gen_md5sum.cc new/libstorage-2.25.7/storage/gen_md5sum.cc --- old/libstorage-2.25.7/storage/gen_md5sum.cc 2014-01-27 16:05:39.000000000 +0100 +++ new/libstorage-2.25.7/storage/gen_md5sum.cc 2014-02-06 11:13:55.000000000 +0100 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "aeb34ab98b9c4343c28a6251ed397b78" -#define SOURCES_MD5_DATE " Mon 27 Jan 16:05:39 CET 2014 " +#define SOURCES_MD5SUM "408a245e9e47961fca38546f2a619932" +#define SOURCES_MD5_DATE " Thu 6 Feb 11:13:55 CET 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/testsuite/Makefile.am new/libstorage-2.25.7/testsuite/Makefile.am --- old/libstorage-2.25.7/testsuite/Makefile.am 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.7/testsuite/Makefile.am 2014-02-03 10:49:03.000000000 +0100 @@ -25,8 +25,8 @@ recursive3.single renumber1.single renumber2.single renumber3.single \ udevdecode.single udevencode.single usedby1.single userdata1.single \ uuid1.single \ - blkid.single btrfs.single dmraid.single dmsetup.single lsscsi.single \ - mdadm-details.single mdadm-examine.single parted.single \ + blkid.single btrfs.single dasdview.single dmraid.single dmsetup.single \ + lsscsi.single mdadm-details.single mdadm-examine.single parted.single \ proc-mdstat.single proc-parts.single backupstate1_single_SOURCES = backupstate1.cc common.h common.cc @@ -70,6 +70,7 @@ blkid_single_SOURCES = blkid.cc common.h common.cc btrfs_single_SOURCES = btrfs.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 lsscsi_single_SOURCES = lsscsi.cc common.h common.cc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/testsuite/Makefile.in new/libstorage-2.25.7/testsuite/Makefile.in --- old/libstorage-2.25.7/testsuite/Makefile.in 2014-01-24 10:42:21.000000000 +0100 +++ new/libstorage-2.25.7/testsuite/Makefile.in 2014-02-06 12:08:11.000000000 +0100 @@ -103,10 +103,11 @@ udevencode.single$(EXEEXT) usedby1.single$(EXEEXT) \ userdata1.single$(EXEEXT) uuid1.single$(EXEEXT) \ blkid.single$(EXEEXT) btrfs.single$(EXEEXT) \ - dmraid.single$(EXEEXT) dmsetup.single$(EXEEXT) \ - lsscsi.single$(EXEEXT) mdadm-details.single$(EXEEXT) \ - mdadm-examine.single$(EXEEXT) parted.single$(EXEEXT) \ - proc-mdstat.single$(EXEEXT) proc-parts.single$(EXEEXT) + dasdview.single$(EXEEXT) dmraid.single$(EXEEXT) \ + dmsetup.single$(EXEEXT) lsscsi.single$(EXEEXT) \ + mdadm-details.single$(EXEEXT) mdadm-examine.single$(EXEEXT) \ + parted.single$(EXEEXT) proc-mdstat.single$(EXEEXT) \ + proc-parts.single$(EXEEXT) subdir = testsuite DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp @@ -151,6 +152,10 @@ crypttab_remove_single_OBJECTS = $(am_crypttab_remove_single_OBJECTS) crypttab_remove_single_LDADD = $(LDADD) crypttab_remove_single_DEPENDENCIES = ../storage/libstorage.la +am_dasdview_single_OBJECTS = dasdview.$(OBJEXT) common.$(OBJEXT) +dasdview_single_OBJECTS = $(am_dasdview_single_OBJECTS) +dasdview_single_LDADD = $(LDADD) +dasdview_single_DEPENDENCIES = ../storage/libstorage.la am_disklabel1_single_OBJECTS = disklabel1.$(OBJEXT) common.$(OBJEXT) disklabel1_single_OBJECTS = $(am_disklabel1_single_OBJECTS) disklabel1_single_LDADD = $(LDADD) @@ -384,11 +389,11 @@ SOURCES = $(backupstate1_single_SOURCES) $(blkid_single_SOURCES) \ $(btrfs_single_SOURCES) $(contvolinfo1_single_SOURCES) \ $(crypttab_add_single_SOURCES) \ - $(crypttab_remove_single_SOURCES) $(disklabel1_single_SOURCES) \ - $(dmraid_single_SOURCES) $(dmsetup_single_SOURCES) \ - $(format1_single_SOURCES) $(freeinfo1_single_SOURCES) \ - $(fstab_add_single_SOURCES) $(fstab_ng_add_single_SOURCES) \ - $(fstab_ng_find_single_SOURCES) \ + $(crypttab_remove_single_SOURCES) $(dasdview_single_SOURCES) \ + $(disklabel1_single_SOURCES) $(dmraid_single_SOURCES) \ + $(dmsetup_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) \ $(fstab_ng_update_single_SOURCES) \ $(fstab_remove_single_SOURCES) $(fstab_update_single_SOURCES) \ @@ -411,11 +416,11 @@ DIST_SOURCES = $(backupstate1_single_SOURCES) $(blkid_single_SOURCES) \ $(btrfs_single_SOURCES) $(contvolinfo1_single_SOURCES) \ $(crypttab_add_single_SOURCES) \ - $(crypttab_remove_single_SOURCES) $(disklabel1_single_SOURCES) \ - $(dmraid_single_SOURCES) $(dmsetup_single_SOURCES) \ - $(format1_single_SOURCES) $(freeinfo1_single_SOURCES) \ - $(fstab_add_single_SOURCES) $(fstab_ng_add_single_SOURCES) \ - $(fstab_ng_find_single_SOURCES) \ + $(crypttab_remove_single_SOURCES) $(dasdview_single_SOURCES) \ + $(disklabel1_single_SOURCES) $(dmraid_single_SOURCES) \ + $(dmsetup_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) \ $(fstab_ng_update_single_SOURCES) \ $(fstab_remove_single_SOURCES) $(fstab_update_single_SOURCES) \ @@ -694,6 +699,7 @@ uuid1_single_SOURCES = uuid1.cc common.h common.cc blkid_single_SOURCES = blkid.cc common.h common.cc btrfs_single_SOURCES = btrfs.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 lsscsi_single_SOURCES = lsscsi.cc common.h common.cc @@ -770,6 +776,10 @@ @rm -f crypttab-remove.single$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(crypttab_remove_single_OBJECTS) $(crypttab_remove_single_LDADD) $(LIBS) +dasdview.single$(EXEEXT): $(dasdview_single_OBJECTS) $(dasdview_single_DEPENDENCIES) $(EXTRA_dasdview_single_DEPENDENCIES) + @rm -f dasdview.single$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(dasdview_single_OBJECTS) $(dasdview_single_LDADD) $(LIBS) + disklabel1.single$(EXEEXT): $(disklabel1_single_OBJECTS) $(disklabel1_single_DEPENDENCIES) $(EXTRA_disklabel1_single_DEPENDENCIES) @rm -f disklabel1.single$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(disklabel1_single_OBJECTS) $(disklabel1_single_LDADD) $(LIBS) @@ -951,6 +961,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/contvolinfo1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypttab-add.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypttab-remove.Po@am__quote@ +@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@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/testsuite/dasdview.cc new/libstorage-2.25.7/testsuite/dasdview.cc --- old/libstorage-2.25.7/testsuite/dasdview.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.7/testsuite/dasdview.cc 2014-02-03 10:49:03.000000000 +0100 @@ -0,0 +1,207 @@ + +#include <iostream> + +#include "common.h" + +#include "storage/Dasdview.h" + + +using namespace std; +using namespace storage; + + +void +parse1() +{ + cout << "parse1" << endl; + + vector<string> lines = { + "", + "--- general DASD information --------------------------------------------------", + "device node : /dev/dasda", + "busid : 0.0.0150", + "type : ECKD", + "device type : hex 3390 dec 13200", + "", + "--- DASD geometry -------------------------------------------------------------", + "number of cylinders : hex 2721 dec 10017", + "tracks per cylinder : hex f dec 15", + "blocks per track : hex c dec 12", + "blocksize : hex 1000 dec 4096", + "", + "--- extended DASD information -------------------------------------------------", + "real device number : hex 0 dec 0", + "subchannel identifier : hex 0 dec 0", + "CU type (SenseID) : hex 3990 dec 14736", + "CU model (SenseID) : hex e9 dec 233", + "device type (SenseID) : hex 3390 dec 13200", + "device model (SenseID) : hex c dec 12", + "open count : hex 1 dec 1", + "req_queue_len : hex 0 dec 0", + "chanq_len : hex 0 dec 0", + "status : hex 5 dec 5", + "label_block : hex 2 dec 2", + "FBA_layout : hex 0 dec 0", + "characteristics_size : hex 40 dec 64", + "confdata_size : hex 100 dec 256", + "format : hex 2 dec 2 CDL formatted", + "features : hex 0 dec 0 default", + "", + "characteristics : 3990e933 900c5e8c 1ff72032 2721000f", + " e000e5a2 05940222 13090674 00000000", + " 00000000 00000000 32321502 dfee0001", + " 0677080f 007f4800 1f3c0000 00002721", + "", + "configuration_data : dc010100 f0f0f2f1 f0f7f9f0 f0c9c2d4", + " f7f5f0f0 f0f0f0f0 f0d3f2f3 f7f10040", + " 40000004 00000000 00000000 00002720", + " 00000000 00000000 00000000 00000000", + " d4020000 f0f0f2f1 f0f7f9f3 f1c9c2d4", + " f7f5f0f0 f0f0f0f0 f0d3f2f3 f7f10000", + " d0000000 f0f0f2f1 f0f7f9f3 f1c9c2d4", + " f7f5f0f0 f0f0f0f0 f0d3f2f3 f7f00000", + " f0000001 f0f0f2f1 f0f7f9f0 f0c9c2d4", + " f7f5f0f0 f0f0f0f0 f0d3f2f3 f7f10000", + " 00000000 00000000 00000000 00000000", + " 00000000 00000000 00000000 00000000", + " 00000000 00000000 00000000 00000000", + " 00000000 00000000 00000000 00000000", + " 80000000 2d001e00 00010004 0000020b", + " 000cc040 4eaff602 00000000 0000a000" + }; + + Dasdview dasdview("/dev/dasda", false); + dasdview.parse(lines); + + cout << dasdview << endl; +} + + +void +parse2() +{ + cout << "parse2" << endl; + + vector<string> lines = { + "", + "--- general DASD information --------------------------------------------------", + "device node : /dev/dasdb", + "busid : 0.0.0160", + "type : ECKD", + "device type : hex 3390 dec 13200", + "", + "--- DASD geometry -------------------------------------------------------------", + "number of cylinders : hex d0b dec 3339", + "tracks per cylinder : hex f dec 15", + "blocks per track : hex 0 dec 0", + "blocksize : hex 200 dec 512", + "", + "--- extended DASD information -------------------------------------------------", + "real device number : hex 0 dec 0", + "subchannel identifier : hex 1 dec 1", + "CU type (SenseID) : hex 3990 dec 14736", + "CU model (SenseID) : hex e9 dec 233", + "device type (SenseID) : hex 3390 dec 13200", + "device model (SenseID) : hex a dec 10", + "open count : hex 1 dec 1", + "req_queue_len : hex 0 dec 0", + "chanq_len : hex 0 dec 0", + "status : hex 3 dec 3", + "label_block : hex 2 dec 2", + "FBA_layout : hex 1 dec 1", + "characteristics_size : hex 40 dec 64", + "confdata_size : hex 100 dec 256", + "format : hex 0 dec 0 NOT formatted", + "features : hex 0 dec 0 default", + "", + "characteristics : 3990e933 900a5e8c 1ff72024 0d0b000f", + " e000e5a2 05940222 13090674 00000000", + " 00000000 00000000 24241502 dfee0001", + " 0677080f 007f4800 1f3c0000 00000d0b", + "", + "configuration_data : dc010100 f0f0f2f1 f0f7f9f0 f0c9c2d4", + " f7f5f0f0 f0f0f0f0 f0d3f2f3 f7f10045", + " 40000004 00000000 00000000 00000d0a", + " 00000000 00000000 00000000 00000000", + " d4020000 f0f0f2f1 f0f7f9f3 f1c9c2d4", + " f7f5f0f0 f0f0f0f0 f0d3f2f3 f7f10000", + " d0000000 f0f0f2f1 f0f7f9f3 f1c9c2d4", + " f7f5f0f0 f0f0f0f0 f0d3f2f3 f7f00000", + " f0000001 f0f0f2f1 f0f7f9f0 f0c9c2d4", + " f7f5f0f0 f0f0f0f0 f0d3f2f3 f7f10000", + " 00000000 00000000 00000000 00000000", + " 00000000 00000000 00000000 00000000", + " 00000000 00000000 00000000 00000000", + " 00000000 00000000 00000000 00000000", + " 80000000 2d001e00 00010004 0000020b", + " 000cc045 c1360f2e 00000000 0000a000" + }; + + Dasdview dasdview("/dev/dasdb", false); + dasdview.parse(lines); + + cout << dasdview << endl; +} + + +void +parse3() +{ + cout << "parse3" << endl; + + vector<string> lines = { + "", + "--- general DASD information --------------------------------------------------", + "device node : /dev/dasdc", + "busid : 0.0.3333", + "type : FBA ", + "device type : hex 9336 dec 37686", + "", + "--- DASD geometry -------------------------------------------------------------", + "number of cylinders : hex 309 dec 777", + "tracks per cylinder : hex 10 dec 16", + "blocks per track : hex 80 dec 128", + "blocksize : hex 200 dec 512", + "", + "--- extended DASD information -------------------------------------------------", + "real device number : hex 0 dec 0", + "subchannel identifier : hex 14 dec 20", + "CU type (SenseID) : hex 6310 dec 25360", + "CU model (SenseID) : hex 80 dec 128", + "device type (SenseID) : hex 9336 dec 37686", + "device model (SenseID) : hex 10 dec 16", + "open count : hex 1 dec 1", + "req_queue_len : hex 0 dec 0", + "chanq_len : hex 0 dec 0", + "status : hex 5 dec 5", + "label_block : hex 1 dec 1", + "FBA_layout : hex 1 dec 1", + "characteristics_size : hex 20 dec 32", + "confdata_size : hex 0 dec 0", + "format : hex 1 dec 1 LDL formatted", + "features : hex 0 dec 0 default", + "", + "characteristics : 30082111 02000000 006f0000 03090000", + " 4e200000 00000000 00000000 00000000", + "", + "" + }; + + Dasdview dasdview("/dev/dasdc", false); + dasdview.parse(lines); + + cout << dasdview << endl; +} + + +int +main() +{ + cout.setf(std::ios::boolalpha); + + setup_logger(); + + parse1(); + parse2(); + parse3(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/testsuite/parted.cc new/libstorage-2.25.7/testsuite/parted.cc --- old/libstorage-2.25.7/testsuite/parted.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.7/testsuite/parted.cc 2014-02-04 09:39:54.000000000 +0100 @@ -44,6 +44,86 @@ } +void +parse2() +{ + cout << "parse2" << endl; + + vector<string> lines = { + "Model: ATA ST3500320NS (scsi)", + "Disk /dev/sda: 60801cyl", + "Sector size (logical/physical): 512B/512B", + "BIOS cylinder,head,sector geometry: 60801,255,63. Each cylinder is 8225kB.", + "Partition Table: gpt_sync_mbr", + "", + "Number Start End Size File system Name Flags", + " 1 0cyl 63cyl 63cyl fat16 primary", + " 2 63cyl 127cyl 63cyl ext3 primary boot, legacy_boot", + " 3 127cyl 18369cyl 18241cyl ext3 primary", + " 4 18369cyl 36610cyl 18241cyl primary", + " 5 36610cyl 36872cyl 261cyl linux-swap(v1) primary", + " 6 36872cyl 60801cyl 23929cyl ext3 primary", + "", + "Model: ATA ST3500320NS (scsi)", + "Disk /dev/sda: 976773168s", + "Sector size (logical/physical): 512B/512B", + "Partition Table: gpt_sync_mbr", + "", + "Number Start End Size File system Name Flags", + " 1 2048s 1028095s 1026048s fat16 primary", + " 2 1028096s 2056191s 1028096s ext3 primary boot, legacy_boot", + " 3 2056192s 295098367s 293042176s ext3 primary", + " 4 295098368s 588140543s 293042176s primary", + " 5 588140544s 592349183s 4208640s linux-swap(v1) primary", + " 6 592349184s 976773119s 384423936s ext3 primary", + "" + }; + + Parted parted("/dev/sdb", false); + parted.parse(lines); + + cout << parted << endl; +} + + +void +parse3() +{ + cout << "parse3" << endl; + + vector<string> lines = { + "Model: IBM S390 DASD drive (dasd)", + "Disk /dev/dasda: 178079cyl", + "Sector size (logical/physical): 512B/4096B", + "BIOS cylinder,head,sector geometry: 178080,15,12. Each cylinder is 92.2kB.", + "Partition Table: dasd", + "Disk Flags: ", + "", + "Number Start End Size File system Flags", + " 1 1cyl 23303cyl 23302cyl linux-swap(v1)", + " 2 23304cyl 25583cyl 2280cyl ext2", + " 3 25584cyl 178079cyl 152496cyl ext4", + "", + "Model: IBM S390 DASD drive (dasd)", + "Disk /dev/dasda: 32054400s", + "Sector size (logical/physical): 512B/4096B", + "Partition Table: dasd", + "Disk Flags: ", + "", + "Number Start End Size File system Flags", + " 1 192s 4194719s 4194528s linux-swap(v1)", + " 2 4194720s 4605119s 410400s ext2", + " 3 4605120s 32054399s 27449280s ext4", + "" + }; + + Parted parted("/dev/dasda", false); + parted.parse(lines); + + cout << parted << endl; +} + + int main() { @@ -52,4 +132,6 @@ setup_logger(); parse1(); + parse2(); + parse3(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/testsuite/single.out/dasdview.out new/libstorage-2.25.7/testsuite/single.out/dasdview.out --- old/libstorage-2.25.7/testsuite/single.out/dasdview.out 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-2.25.7/testsuite/single.out/dasdview.out 2014-02-03 10:49:03.000000000 +0100 @@ -0,0 +1,6 @@ +parse1 +device: /dev/dasda geometry:[10017,15,12,4096] dasd_format:CDL dasd_type:ECKD +parse2 +device: /dev/dasdb geometry:[3339,15,0,512] dasd_format:NONE dasd_type:ECKD +parse3 +device: /dev/dasdc geometry:[777,16,128,512] dasd_format:LDL dasd_type:FBA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.7/testsuite/single.out/parted.out new/libstorage-2.25.7/testsuite/single.out/parted.out --- old/libstorage-2.25.7/testsuite/single.out/parted.out 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.7/testsuite/single.out/parted.out 2014-02-04 09:39:54.000000000 +0100 @@ -1,5 +1,20 @@ parse1 -device:/dev/sda label:msdos geometry:[121601,255,63,512] gpt_enlarge:false +device:/dev/sda label:msdos geometry:[121601,255,63,512] num:1 cylRegion:[0,132] secRegion:[2048,2103296] type:primary id:131 boot num:2 cylRegion:[131,117488] secRegion:[2105344,1887442944] type:primary id:142 +parse2 +device:/dev/sdb label:gpt geometry:[60801,255,63,512] +num:1 cylRegion:[0,64] secRegion:[2048,1026048] type:primary id:12 +num:2 cylRegion:[63,65] secRegion:[1028096,1028096] type:primary id:131 boot +num:3 cylRegion:[127,18243] secRegion:[2056192,293042176] type:primary id:131 +num:4 cylRegion:[18369,18242] secRegion:[295098368,293042176] type:primary id:131 +num:5 cylRegion:[36610,263] secRegion:[588140544,4208640] type:primary id:130 +num:6 cylRegion:[36872,23929] secRegion:[592349184,384423936] type:primary id:131 + +parse3 +device:/dev/dasda label:dasd geometry:[178080,15,12,512] +num:1 cylRegion:[1,23303] secRegion:[192,4194528] type:primary id:130 +num:2 cylRegion:[23304,2280] secRegion:[4194720,410400] type:primary id:131 +num:3 cylRegion:[25584,152496] secRegion:[4605120,27449280] type:primary id:131 + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
