Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2014-10-05 20:30:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-01 07:40:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2014-10-05 20:31:23.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Oct 02 18:00:46 CEST 2014 - [email protected] + +- detect iso9660 and udf filesystems (fate#317247) +- 2.25.28 + +------------------------------------------------------------------- +Thu Oct 02 12:00:30 CEST 2014 - [email protected] + +- in general use wipefs to remove old signatures +- 2.25.27 + +------------------------------------------------------------------- Old: ---- libstorage-2.25.16.tar.bz2 New: ---- libstorage-2.25.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.o5nKYu/_old 2014-10-05 20:31:24.000000000 +0200 +++ /var/tmp/diff_new_pack.o5nKYu/_new 2014-10-05 20:31:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.25.16 +Version: 2.25.18 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.25.16.tar.bz2 -> libstorage-2.25.18.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/LIBVERSION new/libstorage-2.25.18/LIBVERSION --- old/libstorage-2.25.16/LIBVERSION 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.18/LIBVERSION 2014-10-02 18:18:54.000000000 +0200 @@ -1 +1 @@ -5.1.0 +5.2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/VERSION new/libstorage-2.25.18/VERSION --- old/libstorage-2.25.16/VERSION 2014-09-29 13:03:31.000000000 +0200 +++ new/libstorage-2.25.18/VERSION 2014-10-02 18:18:54.000000000 +0200 @@ -1 +1 @@ -2.25.16 +2.25.18 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/bindings/python/libstorage.py new/libstorage-2.25.18/bindings/python/libstorage.py --- old/libstorage-2.25.16/bindings/python/libstorage.py 2014-09-19 16:24:07.000000000 +0200 +++ new/libstorage-2.25.18/bindings/python/libstorage.py 2014-10-02 18:20:03.000000000 +0200 @@ -112,6 +112,8 @@ NFS = _libstorage.NFS NFS4 = _libstorage.NFS4 TMPFS = _libstorage.TMPFS +ISO9660 = _libstorage.ISO9660 +UDF = _libstorage.UDF FSNONE = _libstorage.FSNONE PRIMARY = _libstorage.PRIMARY EXTENDED = _libstorage.EXTENDED @@ -232,6 +234,9 @@ __swig_setmethods__["labelLength"] = _libstorage.FsCapabilities_labelLength_set __swig_getmethods__["labelLength"] = _libstorage.FsCapabilities_labelLength_get if _newclass:labelLength = _swig_property(_libstorage.FsCapabilities_labelLength_get, _libstorage.FsCapabilities_labelLength_set) + __swig_setmethods__["canFormat"] = _libstorage.FsCapabilities_canFormat_set + __swig_getmethods__["canFormat"] = _libstorage.FsCapabilities_canFormat_get + if _newclass:canFormat = _swig_property(_libstorage.FsCapabilities_canFormat_get, _libstorage.FsCapabilities_canFormat_set) __swig_setmethods__["minimalFsSizeK"] = _libstorage.FsCapabilities_minimalFsSizeK_set __swig_getmethods__["minimalFsSizeK"] = _libstorage.FsCapabilities_minimalFsSizeK_get if _newclass:minimalFsSizeK = _swig_property(_libstorage.FsCapabilities_minimalFsSizeK_get, _libstorage.FsCapabilities_minimalFsSizeK_set) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/examples/TestLogging.cc new/libstorage-2.25.18/examples/TestLogging.cc --- old/libstorage-2.25.16/examples/TestLogging.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.18/examples/TestLogging.cc 2014-10-02 18:18:54.000000000 +0200 @@ -87,6 +87,8 @@ case NFS: cout << "NFS"; break; case NFS4: cout << "NFS4"; break; case TMPFS: cout << "TMPFS"; break; + case ISO9660: cout << "ISO9660"; break; + case UDF: cout << "UDF"; break; case FSNONE: cout << "NONE"; break; } cout << '\n'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/examples/TestProbing.cc new/libstorage-2.25.18/examples/TestProbing.cc --- old/libstorage-2.25.16/examples/TestProbing.cc 2014-01-22 10:39:57.000000000 +0100 +++ new/libstorage-2.25.18/examples/TestProbing.cc 2014-10-02 18:18:54.000000000 +0200 @@ -65,6 +65,8 @@ case NFS: cout << "NFS"; break; case NFS4: cout << "NFS4"; break; case TMPFS: cout << "TMPFS"; break; + case ISO9660: cout << "ISO9660"; break; + case UDF: cout << "UDF"; break; case FSNONE: cout << "NONE"; break; } cout << '\n'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/storage/Dasd.cc new/libstorage-2.25.18/storage/Dasd.cc --- old/libstorage-2.25.16/storage/Dasd.cc 2014-03-06 17:30:22.000000000 +0100 +++ new/libstorage-2.25.18/storage/Dasd.cc 2014-10-02 18:18:54.000000000 +0200 @@ -371,18 +371,13 @@ } - static const string dasd_type_names[] = { + const vector<string> EnumInfo<Dasd::DasdType>::names({ "NONE", "ECKD", "FBA" - }; + }); - const vector<string> EnumInfo<Dasd::DasdType>::names(dasd_type_names, dasd_type_names + - lengthof(dasd_type_names)); - static const string dasd_format_names[] = { + const vector<string> EnumInfo<Dasd::DasdFormat>::names({ "NONE", "LDL", "CDL" - }; - - const vector<string> EnumInfo<Dasd::DasdFormat>::names(dasd_format_names, dasd_format_names + - lengthof(dasd_format_names)); + }); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/storage/Disk.cc new/libstorage-2.25.18/storage/Disk.cc --- old/libstorage-2.25.16/storage/Disk.cc 2014-09-25 16:39:17.000000000 +0200 +++ new/libstorage-2.25.18/storage/Disk.cc 2014-10-02 14:26:35.000000000 +0200 @@ -1707,7 +1707,8 @@ } -int Disk::doCreateLabel() + int + Disk::doCreateLabel() { y2mil("label:" << label); int ret = 0; @@ -1715,11 +1716,10 @@ if( !dmp_slave ) getStorage()->removeDmMapsTo( device() ); removePresentPartitions(); - std::ostringstream cmd_line; - classic(cmd_line); - cmd_line << MDADMBIN " --zero-superblock --force " << quote(device()); - execCheckFailed( cmd_line.str() ); - cmd_line.str(""); + + SystemCmd cmd; + cmd.execute(WIPEFSBIN " --all " + quote(device())); + string lab(label); if( lab=="gpt" ) { @@ -1731,8 +1731,9 @@ lab = LABEL_GPT_SYNC_MBR; } } - cmd_line << PARTEDCMD << quote(device()) << " mklabel " << lab; - if( execCheckFailed( cmd_line.str() ) ) + + string cmd_line = PARTEDCMD + quote(device()) + " mklabel " + lab; + if (execCheckFailed(cmd_line)) { ret = DISK_SET_LABEL_PARTED_FAILED; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/storage/Enum.cc new/libstorage-2.25.18/storage/Enum.cc --- old/libstorage-2.25.16/storage/Enum.cc 2014-04-08 14:04:19.000000000 +0200 +++ new/libstorage-2.25.18/storage/Enum.cc 2014-10-02 18:18:54.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2004-2010] Novell, Inc. + * Copyright (c) [2004-2014] Novell, Inc. * * All Rights Reserved. * @@ -28,109 +28,74 @@ { // strings must match /etc/fstab - static const string fs_type_names[] = { + const vector<string> EnumInfo<FsType>::names({ "unknown", "reiserfs", "ext2", "ext3", "ext4", "btrfs", "vfat", "xfs", "jfs", "hfs", - "ntfs-3g", "swap", "hfsplus", "nfs", "nfs4", "tmpfs", "none" - }; + "ntfs-3g", "swap", "hfsplus", "nfs", "nfs4", "tmpfs", "iso9660", "udf", "none" + }); - const vector<string> EnumInfo<FsType>::names(fs_type_names, fs_type_names + - lengthof(fs_type_names)); - - static const string partition_type_names[] = { + const vector<string> EnumInfo<PartitionType>::names({ "primary", "extended", "logical", "any" - }; - - const vector<string> EnumInfo<PartitionType>::names(partition_type_names, partition_type_names + - lengthof(partition_type_names)); + }); - static const string mount_by_names[] = { + const vector<string> EnumInfo<MountByType>::names({ "device", "uuid", "label", "id", "path" - }; - - const vector<string> EnumInfo<MountByType>::names(mount_by_names, mount_by_names + - lengthof(mount_by_names)); + }); - static const string encrypt_names[] = { + const vector<string> EnumInfo<EncryptType>::names({ "none", "twofish256", "twofish", "twofishSL92", "luks", "unknown" - }; - - const vector<string> EnumInfo<EncryptType>::names(encrypt_names, encrypt_names + - lengthof(encrypt_names)); + }); // strings must match /proc/mdstat - static const string md_type_names[] = { + const vector<string> EnumInfo<MdType>::names({ "unknown", "raid0", "raid1", "raid5", "raid6", "raid10", "multipath" - }; - - const vector<string> EnumInfo<MdType>::names(md_type_names, md_type_names + - lengthof(md_type_names)); + }); // strings must match "mdadm --parity" option - static const string md_parity_names[] = { + const vector<string> EnumInfo<MdParity>::names({ "default", "left-asymmetric", "left-symmetric", "right-asymmetric", "right-symmetric", "parity-first", "parity-last", "left-asymmetric-6", "left-symmetric-6", "right-asymmetric-6", "right-symmetric-6", "parity-first-6", "n2", "o2", "f2", "n3", "o3", "f3" - }; - - const vector<string> EnumInfo<MdParity>::names(md_parity_names, md_parity_names + - lengthof(md_parity_names)); + }); // strings must match /sys/block/md*/md/array_state - static const string md_array_state_names[] = { + const vector<string> EnumInfo<MdArrayState>::names({ "unknown", "clear", "inactive", "suspended", "readonly", "read-auto", "clean", "active", "write-pending", "active-idle" - }; + }); - const vector<string> EnumInfo<MdArrayState>::names(md_array_state_names, md_array_state_names + - lengthof(md_array_state_names)); - - static const string used_by_type_names[] = { + const vector<string> EnumInfo<UsedByType>::names({ "NONE", "LVM", "MD", "MDPART", "DM", "DMRAID", "DMMULTIPATH", "BTRFS" - }; - - const vector<string> EnumInfo<UsedByType>::names(used_by_type_names, used_by_type_names + - lengthof(used_by_type_names)); - + }); - static const string c_type_names[] = { - "UNKNOWN", "DISK", "MD", "LOOP", "LVM", "DM", "DMRAID", "NFS", "DMMULTIPATH", "MDPART", "BTRFS", "TMPFS" - }; - const vector<string> EnumInfo<CType>::names(c_type_names, c_type_names + - lengthof(c_type_names)); + const vector<string> EnumInfo<CType>::names({ + "UNKNOWN", "DISK", "MD", "LOOP", "LVM", "DM", "DMRAID", "NFS", "DMMULTIPATH", "MDPART", + "BTRFS", "TMPFS" + }); - static const string transport_names[] = { + const vector<string> EnumInfo<Transport>::names({ "UNKNOWN", "SBP", "ATA", "FC", "iSCSI", "SAS", "SATA", "SPI", "USB", "FCoE" - }; + }); - const vector<string> EnumInfo<Transport>::names(transport_names, transport_names + - lengthof(transport_names)); - - static const string multipath_autostart_names[] = { + const vector<string> EnumInfo<MultipathAutostart>::names({ "UNDECIDED", "ON", "OFF" - }; - - const vector<string> EnumInfo<MultipathAutostart>::names(multipath_autostart_names, multipath_autostart_names + - lengthof(multipath_autostart_names)); + }); // strings must match "parted --align" option - static const string part_align_names[] = { + const vector<string> EnumInfo<PartAlign>::names({ "optimal", "cylinder" - }; - - const vector<string> EnumInfo<PartAlign>::names(part_align_names, part_align_names + - lengthof(part_align_names)); + }); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/storage/LvmVg.cc new/libstorage-2.25.18/storage/LvmVg.cc --- old/libstorage-2.25.16/storage/LvmVg.cc 2014-09-16 16:42:18.000000000 +0200 +++ new/libstorage-2.25.18/storage/LvmVg.cc 2014-10-02 14:26:35.000000000 +0200 @@ -1880,16 +1880,9 @@ y2mil("device:" << pv.device << " realDevice:" << pv.realDevice()); getStorage()->unaccessDev(pv.device); SystemCmd c; - string cmd = MDADMBIN " --zero-superblock " + quote(pv.realDevice()); - c.execute( cmd ); + c.execute(WIPEFSBIN " --all " + quote(pv.realDevice())); getStorage()->removeDmTableTo(pv.realDevice()); - if (getStorage()->isDisk(pv.realDevice())) - { - cmd = PARTEDCMD + quote(pv.realDevice()) + " mklabel msdos"; - c.execute( cmd ); - } - cmd = "echo y | " PVCREATEBIN " -ff " + metaString() + quote(pv.realDevice()); - c.execute( cmd ); + c.execute("echo y | " PVCREATEBIN " -ff " + metaString() + quote(pv.realDevice())); if( c.retcode()!=0 ) { ret = LVM_CREATE_PV_FAILED; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/storage/Storage.cc new/libstorage-2.25.18/storage/Storage.cc --- old/libstorage-2.25.16/storage/Storage.cc 2014-09-19 11:31:22.000000000 +0200 +++ new/libstorage-2.25.18/storage/Storage.cc 2014-10-02 18:18:54.000000000 +0200 @@ -5605,12 +5605,12 @@ { struct FsCapabilitiesX : public FsCapabilities { - FsCapabilitiesX (bool isExtendableX, bool isExtendableWhileMountedX, - bool isReduceableX, bool isReduceableWhileMountedX, - bool supportsUuidX, bool supportsLabelX, - bool labelWhileMountedX, unsigned int labelLengthX, - unsigned long long minimalFsSizeKX) - : FsCapabilities () + FsCapabilitiesX(bool isExtendableX, bool isExtendableWhileMountedX, + bool isReduceableX, bool isReduceableWhileMountedX, + bool supportsUuidX, bool supportsLabelX, + bool labelWhileMountedX, unsigned int labelLengthX, + bool canFormatX, unsigned long long minimalFsSizeKX) + : FsCapabilities() { isExtendable = isExtendableX; isExtendableWhileMounted = isExtendableWhileMountedX; @@ -5620,50 +5620,57 @@ supportsLabel = supportsLabelX; labelWhileMounted = labelWhileMountedX; labelLength = labelLengthX; + canFormat = canFormatX; minimalFsSizeK = minimalFsSizeKX; } }; - static FsCapabilitiesX reiserfsCaps (true, true, true, false, true, true, - false, 16, 50*1024); + static FsCapabilitiesX reiserfsCaps(true, true, true, false, true, true, + false, 16, true, 50*1024); - static FsCapabilitiesX ext2Caps (true, false, true, false, true, true, - true, 16, 100); + static FsCapabilitiesX ext2Caps(true, false, true, false, true, true, + true, 16, true, 100); - static FsCapabilitiesX ext3Caps (true, true, true, false, true, true, - true, 16, 10*1024); + static FsCapabilitiesX ext3Caps(true, true, true, false, true, true, + true, 16, true, 10*1024); - static FsCapabilitiesX ext4Caps (true, true, true, false, true, true, - true, 16, 32*1024); + static FsCapabilitiesX ext4Caps(true, true, true, false, true, true, + true, 16, true, 32*1024); // btrfs can be shrunk but it is not possible to know the minimal possible // size in advance (see bnc #894832), thus not allowed here - static FsCapabilitiesX btrfsCaps (true, true, false, false, true, true, - true, 256, 256*1024); + static FsCapabilitiesX btrfsCaps(true, true, false, false, true, true, + true, 256, true, 256*1024); - static FsCapabilitiesX xfsCaps (true, true, false, false, true, true, - false, 12, 40*1024); + static FsCapabilitiesX xfsCaps(true, true, false, false, true, true, + false, 12, true, 40*1024); - static FsCapabilitiesX ntfsCaps (true, false, true, false, true, true, - false, 32, 10*1024); + static FsCapabilitiesX ntfsCaps(true, false, true, false, true, true, + false, 32, true, 10*1024); - static FsCapabilitiesX fatCaps (true, false, true, false, true, true, - false, 11, 64); + static FsCapabilitiesX fatCaps(true, false, true, false, true, true, + false, 11, true, 64); - static FsCapabilitiesX swapCaps (true, false, true, false, true, true, - false, 15, 64); + static FsCapabilitiesX swapCaps(true, false, true, false, true, true, + false, 15, true, 64); - static FsCapabilitiesX jfsCaps (false, false, false, false, true, true, - false, 16, 16*1024); + static FsCapabilitiesX jfsCaps(false, false, false, false, true, true, + false, 16, true, 16*1024); - static FsCapabilitiesX hfsCaps (false, false, false, false, false, false, - false, 0, 10*1024); + static FsCapabilitiesX hfsCaps(false, false, false, false, false, false, + false, 0, true, 10*1024); static FsCapabilitiesX hfspCaps(false, false, false, false, false, false, - false, 0, 10*1024); + false, 0, true, 10*1024); - static FsCapabilitiesX nfsCaps (false, false, false, false, false, false, - false, 0, 10*1024); + static FsCapabilitiesX nfsCaps(false, false, false, false, false, false, + false, 0, true, 10*1024); + + static FsCapabilitiesX iso9660Caps(false, false, false, false, false, false, + false, 0, false, 0); + + static FsCapabilitiesX udfCaps(false, false, false, false, false, false, + false, 0, false, 0); switch (fstype) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/storage/StorageInterface.h new/libstorage-2.25.18/storage/StorageInterface.h --- old/libstorage-2.25.16/storage/StorageInterface.h 2014-04-07 17:01:03.000000000 +0200 +++ new/libstorage-2.25.18/storage/StorageInterface.h 2014-10-02 18:18:54.000000000 +0200 @@ -139,7 +139,7 @@ namespace storage { enum FsType { FSUNKNOWN, REISERFS, EXT2, EXT3, EXT4, BTRFS, VFAT, XFS, JFS, HFS, NTFS, - SWAP, HFSPLUS, NFS, NFS4, TMPFS, FSNONE }; + SWAP, HFSPLUS, NFS, NFS4, TMPFS, ISO9660, UDF, FSNONE }; enum PartitionType { PRIMARY, EXTENDED, LOGICAL, PTYPE_ANY }; @@ -227,6 +227,7 @@ bool supportsLabel; bool labelWhileMounted; unsigned int labelLength; + bool canFormat; unsigned long long minimalFsSizeK; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/storage/StorageVersion.h new/libstorage-2.25.18/storage/StorageVersion.h --- old/libstorage-2.25.16/storage/StorageVersion.h 2014-09-29 13:03:56.000000000 +0200 +++ new/libstorage-2.25.18/storage/StorageVersion.h 2014-10-02 18:56:04.000000000 +0200 @@ -24,10 +24,10 @@ #define STORAGE_VERSION_H -#define LIBSTORAGE_VERSION_STRING "5.1.0" +#define LIBSTORAGE_VERSION_STRING "5.2.0" #define LIBSTORAGE_VERSION_MAJOR 5 -#define LIBSTORAGE_VERSION_MINOR 1 +#define LIBSTORAGE_VERSION_MINOR 2 #define LIBSTORAGE_VERSION_PATCHLEVEL 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/storage/SystemInfo/CmdBlkid.cc new/libstorage-2.25.18/storage/SystemInfo/CmdBlkid.cc --- old/libstorage-2.25.16/storage/SystemInfo/CmdBlkid.cc 2014-04-14 10:23:54.000000000 +0200 +++ new/libstorage-2.25.18/storage/SystemInfo/CmdBlkid.cc 2014-10-02 18:18:54.000000000 +0200 @@ -73,7 +73,9 @@ { "reiserfs", REISERFS }, { "swap", SWAP }, { "vfat", VFAT }, - { "xfs", XFS } + { "xfs", XFS }, + { "iso9660", ISO9660 }, + { "udf", UDF } }; data.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/storage/gen_md5sum.cc new/libstorage-2.25.18/storage/gen_md5sum.cc --- old/libstorage-2.25.16/storage/gen_md5sum.cc 2014-09-25 16:40:11.000000000 +0200 +++ new/libstorage-2.25.18/storage/gen_md5sum.cc 2014-10-02 18:19:59.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "159252ac4b2837ecf24dec15944af9e1" -#define SOURCES_MD5_DATE " Thu 25 Sep 16:40:11 CEST 2014 " +#define SOURCES_MD5SUM "e723741977ba0153f4b233ba1db524dd" +#define SOURCES_MD5_DATE " Thu 2 Oct 18:19:59 CEST 2014 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/testsuite/blkid.cc new/libstorage-2.25.18/testsuite/blkid.cc --- old/libstorage-2.25.16/testsuite/blkid.cc 2014-03-19 11:11:26.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/blkid.cc 2014-10-02 18:18:54.000000000 +0200 @@ -69,6 +69,24 @@ } +void +parse4() +{ + cout << "parse4" << endl; + + vector<string> lines = { + "/dev/sdb: UUID=\"2013-06-14-19-02-28-00\" LABEL=\"SLES-11-SP3-MINI-ISO-x86_640703\" TYPE=\"iso9660\" ", + "/dev/sdc1: SEC_TYPE=\"msdos\" LABEL=\"BOOT\" UUID=\"65CB-FEB0\" TYPE=\"vfat\" PARTUUID=\"a893698d-01\" ", + "/dev/sdc2: UUID=\"2013-11-06-15-55-09-00\" LABEL=\"openSUSE 13.1 KDE Live\" TYPE=\"udf\" PARTUUID=\"a893698d-02\" " + }; + + Blkid blkid(false); + blkid.parse(lines); + + cout << blkid << endl; +} + + int main() { @@ -79,4 +97,5 @@ parse1(); parse2(); parse3(); + parse4(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/testsuite/common.cc new/libstorage-2.25.18/testsuite/common.cc --- old/libstorage-2.25.16/testsuite/common.cc 2014-02-20 16:09:58.000000000 +0100 +++ new/libstorage-2.25.18/testsuite/common.cc 2014-10-02 18:18:54.000000000 +0200 @@ -123,6 +123,8 @@ case NFS: cout << "NFS"; break; case NFS4: cout << "NFS4"; break; case TMPFS: cout << "TMPFS"; break; + case ISO9660: cout << "ISO9660"; break; + case UDF: cout << "UDF"; break; case FSNONE: cout << "NONE"; break; } cout << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.16/testsuite/single.out/blkid.out new/libstorage-2.25.18/testsuite/single.out/blkid.out --- old/libstorage-2.25.16/testsuite/single.out/blkid.out 2014-04-14 10:23:54.000000000 +0200 +++ new/libstorage-2.25.18/testsuite/single.out/blkid.out 2014-10-02 18:18:54.000000000 +0200 @@ -18,3 +18,8 @@ parse3 data[/dev/dasda1] -> is_fs:true fs_type:ext4 fs_uuid:ab43b144-37e2-4e9c-8369-6df220f055b0 +parse4 +data[/dev/sdb] -> is_fs:true fs_type:iso9660 fs_uuid:2013-06-14-19-02-28-00 fs_label:SLES-11-SP3-MINI-ISO-x86_640703 +data[/dev/sdc1] -> is_fs:true fs_type:vfat fs_uuid:65CB-FEB0 fs_label:BOOT +data[/dev/sdc2] -> is_fs:true fs_type:udf fs_uuid:2013-11-06-15-55-09-00 fs_label:openSUSE 13.1 KDE Live + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
