Hello community, here is the log from the commit of package libstorage-ng for openSUSE:Factory checked in at 2018-05-06 14:58:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng" Sun May 6 14:58:45 2018 rev:20 rq:604530 version:3.3.269 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2018-05-01 22:46:22.673806762 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new/libstorage-ng.changes 2018-05-06 14:58:47.398924049 +0200 @@ -1,0 +2,44 @@ +Sat May 5 16:43:00 UTC 2018 - opensuse-packag...@opensuse.org + +- Translated using Weblate (German) +- 3.3.269 + +-------------------------------------------------------------------- +Fri May 4 15:16:10 UTC 2018 - opensuse-packag...@opensuse.org + +- Translated using Weblate (French) +- 3.3.268 + +-------------------------------------------------------------------- +Thu May 3 19:32:02 UTC 2018 - opensuse-packag...@opensuse.org + +- Translated using Weblate (Portuguese (Brazil)) +- 3.3.267 + +-------------------------------------------------------------------- +Thu May 3 12:22:40 UTC 2018 - aschn...@suse.de + +- merge gh#openSUSE/libstorage-ng#524 +- fixed probing of NTFS (in special cases) (bsc#1091585) +- added unit test +- 3.3.266 + +-------------------------------------------------------------------- +Wed May 2 14:05:03 UTC 2018 - opensuse-packag...@opensuse.org + +- Translated using Weblate (Catalan) +- 3.3.265 + +-------------------------------------------------------------------- +Wed May 2 14:02:24 UTC 2018 - opensuse-packag...@opensuse.org + +- Translated using Weblate (Catalan) +- 3.3.264 + +-------------------------------------------------------------------- +Wed May 2 06:03:43 UTC 2018 - opensuse-packag...@opensuse.org + +- Translated using Weblate (Slovak) +- 3.3.263 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-3.3.262.tar.xz New: ---- libstorage-ng-3.3.269.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.DZyzh8/_old 2018-05-06 14:58:48.098898362 +0200 +++ /var/tmp/diff_new_pack.DZyzh8/_new 2018-05-06 14:58:48.102898216 +0200 @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 3.3.262 +Version: 3.3.269 Release: 0 Summary: Library for storage management License: GPL-2.0 ++++++ libstorage-ng-3.3.262.tar.xz -> libstorage-ng-3.3.269.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/VERSION new/libstorage-ng-3.3.269/VERSION --- old/libstorage-ng-3.3.262/VERSION 2018-04-30 10:25:41.000000000 +0200 +++ new/libstorage-ng-3.3.269/VERSION 2018-05-05 18:43:13.000000000 +0200 @@ -1 +1 @@ -3.3.262 +3.3.269 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/po/ca.po new/libstorage-ng-3.3.269/po/ca.po --- old/libstorage-ng-3.3.262/po/ca.po 2018-04-30 10:25:41.000000000 +0200 +++ new/libstorage-ng-3.3.269/po/ca.po 2018-05-05 18:43:13.000000000 +0200 @@ -9,9 +9,10 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-26 20:33+0200\n" -"PO-Revision-Date: 2018-04-18 19:00+0000\n" +"PO-Revision-Date: 2018-05-02 17:00+0000\n" "Last-Translator: David Medina <medi...@gmail.com>\n" -"Language-Team: Catalan <https://l10n.opensuse.org/projects/libstorage/ng-master/ca/>\n" +"Language-Team: Catalan <https://l10n.opensuse.org/projects/libstorage/ng-" +"master/ca/>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -261,7 +262,7 @@ #. %1$s is replaced by device name (e.g. /dev/sda) #, c-format msgid "Create DASD partition table on %1$s" -msgstr "Crea una taula de particions DASD a %1$s" +msgstr "Crea una taula de particions de DASD a %1$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sda) @@ -588,7 +589,7 @@ #. %1$s is replaced by device name (e.g. /dev/sda) #, c-format msgid "Creating DASD partition table on %1$s" -msgstr "Creant una taula de particions DASD a %1$s" +msgstr "Creant una taula de particions de DASD a %1$s" #. TRANSLATORS: displayed during action, #. %1$s is replaced by device name (e.g. /dev/sda) @@ -707,7 +708,7 @@ #. TRANSLATORS: name of object msgid "DASD Partition Table" -msgstr "Taula de particions DASD" +msgstr "Taula de particions de DASD" #. TRANSLATORS: name of object msgid "DM RAID" @@ -815,7 +816,7 @@ #. %1$s is replaced by device name (e.g. /dev/sda) #, c-format msgid "Delete DASD partition table on %1$s" -msgstr "Suprimeix la taula de particions DASD de %1$s" +msgstr "Suprimeix la taula de particions de DASD de %1$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sda) @@ -952,7 +953,7 @@ #. %1$s is replaced by device name (e.g. /dev/sda) #, c-format msgid "Deleting DASD partition table on %1$s" -msgstr "Suprimint la taula de particions DASD de %1$s" +msgstr "Suprimint la taula de particions de DASD de %1$s" #. TRANSLATORS: displayed during action, #. %1$s is replaced by device name (e.g. /dev/sda) @@ -1465,17 +1466,17 @@ msgstr "PiB" #. TRANSLATORS: error message -#, fuzzy, c-format +#, c-format msgid "Probing DASD %s failed" -msgstr "Ha fallat sondar DASD" +msgstr "Ha fallat sondar el DASD %s" #. TRANSLATORS: progress message msgid "Probing DASDs" -msgstr "Sondant DASD" +msgstr "Sondant els DASD" #. TRANSLATORS: error message msgid "Probing DASDs failed" -msgstr "Ha fallat sondar DASD" +msgstr "Ha fallat sondar els DASD" #. TRANSLATORS: progress message msgid "Probing DM RAIDs" @@ -1502,9 +1503,9 @@ msgstr "Ha fallat sondar LVM" #. TRANSLATORS: error message -#, fuzzy, c-format +#, c-format msgid "Probing MD RAID %s failed" -msgstr "Ha fallat sondar RAID MD" +msgstr "Ha fallat sondar la RAID MD %s" #. TRANSLATORS: progress message msgid "Probing MD RAIDs" @@ -1527,9 +1528,9 @@ msgstr "Sondant bcau" #. TRANSLATORS: error message -#, fuzzy, c-format +#, c-format msgid "Probing bcache %s failed" -msgstr "Ha fallat sondar bcau" +msgstr "Ha fallat sondar la bcau %s" #. TRANSLATORS: error message msgid "Probing bcache failed" @@ -1557,9 +1558,8 @@ msgstr "Ha fallat sondar els discs" #. TRANSLATORS: error message -#, fuzzy msgid "Probing failed" -msgstr "Ha fallat sondar LVM" +msgstr "Ha fallat el sondeig" #. TRANSLATORS: error message #, c-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/po/de.po new/libstorage-ng-3.3.269/po/de.po --- old/libstorage-ng-3.3.262/po/de.po 2018-04-30 10:25:41.000000000 +0200 +++ new/libstorage-ng-3.3.269/po/de.po 2018-05-05 18:43:13.000000000 +0200 @@ -14,9 +14,10 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-26 20:33+0200\n" -"PO-Revision-Date: 2018-04-23 11:02+0000\n" -"Last-Translator: Franziska Weinberger <f.weinber...@gemino.de>\n" -"Language-Team: German <https://l10n.opensuse.org/projects/libstorage/ng-master/de/>\n" +"PO-Revision-Date: 2018-05-05 16:43+0000\n" +"Last-Translator: Sarah Kriesch <ada.lovel...@gmx.de>\n" +"Language-Team: German <https://l10n.opensuse.org/projects/libstorage/ng-" +"master/de/>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1470,9 +1471,9 @@ msgstr "PiB" #. TRANSLATORS: error message -#, fuzzy, c-format +#, c-format msgid "Probing DASD %s failed" -msgstr "Untersuchung von DASDs fehlgeschlagen" +msgstr "Untersuchung von DASD %s fehlgeschlagen" #. TRANSLATORS: progress message msgid "Probing DASDs" @@ -1507,9 +1508,9 @@ msgstr "Untersuchen von LVM fehlgeschlagen" #. TRANSLATORS: error message -#, fuzzy, c-format +#, c-format msgid "Probing MD RAID %s failed" -msgstr "Untersuchen von MD RAIDs fehlgeschlagen" +msgstr "Untersuchen von MD RAID %s fehlgeschlagen" #. TRANSLATORS: progress message msgid "Probing MD RAIDs" @@ -1532,9 +1533,9 @@ msgstr "Bcache wird untersucht" #. TRANSLATORS: error message -#, fuzzy, c-format +#, c-format msgid "Probing bcache %s failed" -msgstr "Untersuchen von bcache fehlgeschlagen" +msgstr "Untersuchen von bcache %s fehlgeschlagen" #. TRANSLATORS: error message msgid "Probing bcache failed" @@ -1562,9 +1563,8 @@ msgstr "Untersuchen von Festplatten fehlgeschlagen" #. TRANSLATORS: error message -#, fuzzy msgid "Probing failed" -msgstr "Untersuchen von LVM fehlgeschlagen" +msgstr "Untersuchung fehlgeschlagen" #. TRANSLATORS: error message #, c-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/po/fr.po new/libstorage-ng-3.3.269/po/fr.po --- old/libstorage-ng-3.3.262/po/fr.po 2018-04-30 10:25:41.000000000 +0200 +++ new/libstorage-ng-3.3.269/po/fr.po 2018-05-05 18:43:13.000000000 +0200 @@ -11,9 +11,10 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-26 20:33+0200\n" -"PO-Revision-Date: 2018-04-23 10:02+0000\n" -"Last-Translator: Christine Gabriel <christ...@stoquart.com>\n" -"Language-Team: French <https://l10n.opensuse.org/projects/libstorage/ng-master/fr/>\n" +"PO-Revision-Date: 2018-05-04 15:16+0000\n" +"Last-Translator: Benoît Monin <benoit.mo...@gmx.fr>\n" +"Language-Team: French <https://l10n.opensuse.org/projects/libstorage/ng-" +"master/fr/>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1599,9 +1600,9 @@ msgstr "Pio" #. TRANSLATORS: error message -#, fuzzy, c-format +#, c-format msgid "Probing DASD %s failed" -msgstr "Échec du sondage des DASD" +msgstr "Échec du sondage du DASD %s" #. TRANSLATORS: progress message msgid "Probing DASDs" @@ -1637,9 +1638,9 @@ msgstr "Échec du sondage de LVM" #. TRANSLATORS: error message -#, fuzzy, c-format +#, c-format msgid "Probing MD RAID %s failed" -msgstr "Échec du sondage des systèmes MD RAID" +msgstr "Échec du sondage du système MD RAID %s" # TLABEL partitioning_2002_01_04_0147__465 #. TRANSLATORS: progress message @@ -1663,9 +1664,9 @@ msgstr "Sondage de bcache" #. TRANSLATORS: error message -#, fuzzy, c-format +#, c-format msgid "Probing bcache %s failed" -msgstr "Échec du sondage de bcache" +msgstr "Échec du sondage du bcache %s" #. TRANSLATORS: error message msgid "Probing bcache failed" @@ -1693,9 +1694,8 @@ msgstr "Échec du sondage des disques" #. TRANSLATORS: error message -#, fuzzy msgid "Probing failed" -msgstr "Échec du sondage de LVM" +msgstr "Échec du sondage" #. TRANSLATORS: error message #, c-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/po/pt_BR.po new/libstorage-ng-3.3.269/po/pt_BR.po --- old/libstorage-ng-3.3.262/po/pt_BR.po 2018-04-30 10:25:41.000000000 +0200 +++ new/libstorage-ng-3.3.269/po/pt_BR.po 2018-05-05 18:43:13.000000000 +0200 @@ -12,9 +12,10 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-26 20:33+0200\n" -"PO-Revision-Date: 2018-04-24 13:24+0000\n" -"Last-Translator: Samanta Magalhaes <sama...@texttrans.com>\n" -"Language-Team: Portuguese (Brazil) <https://l10n.opensuse.org/projects/libstorage/ng-master/pt_BR/>\n" +"PO-Revision-Date: 2018-05-03 19:32+0000\n" +"Last-Translator: Luiz Fernando Ranghetti <elcheviv...@gmail.com>\n" +"Language-Team: Portuguese (Brazil) " +"<https://l10n.opensuse.org/projects/libstorage/ng-master/pt_BR/>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1468,9 +1469,9 @@ msgstr "PiB" #. TRANSLATORS: error message -#, fuzzy, c-format +#, c-format msgid "Probing DASD %s failed" -msgstr "Falha ao investigar DASDs" +msgstr "Falha ao investigar DASDs %s" #. TRANSLATORS: progress message msgid "Probing DASDs" @@ -1505,9 +1506,9 @@ msgstr "Falha ao investigar LVM" #. TRANSLATORS: error message -#, fuzzy, c-format +#, c-format msgid "Probing MD RAID %s failed" -msgstr "Falha ao investigar MD RAIDs" +msgstr "Falha ao investigar MD RAID %s" #. TRANSLATORS: progress message msgid "Probing MD RAIDs" @@ -1530,9 +1531,9 @@ msgstr "Investigando bcache" #. TRANSLATORS: error message -#, fuzzy, c-format +#, c-format msgid "Probing bcache %s failed" -msgstr "Falha ao investigar bcache" +msgstr "Falha ao investigar bcache %s" #. TRANSLATORS: error message msgid "Probing bcache failed" @@ -1560,9 +1561,8 @@ msgstr "Falha ao investigar discos" #. TRANSLATORS: error message -#, fuzzy msgid "Probing failed" -msgstr "Falha ao investigar LVM" +msgstr "Falha ao investigar" #. TRANSLATORS: error message #, c-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/po/sk.po new/libstorage-ng-3.3.269/po/sk.po --- old/libstorage-ng-3.3.262/po/sk.po 2018-04-30 10:25:41.000000000 +0200 +++ new/libstorage-ng-3.3.269/po/sk.po 2018-05-05 18:43:13.000000000 +0200 @@ -6,9 +6,10 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-26 20:33+0200\n" -"PO-Revision-Date: 2018-01-26 07:59+0000\n" +"PO-Revision-Date: 2018-05-02 09:06+0000\n" "Last-Translator: Ferdinand Galko <galko.ferdin...@gmail.com>\n" -"Language-Team: Slovak <https://l10n.opensuse.org/projects/libstorage/ng-master/sk/>\n" +"Language-Team: Slovak <https://l10n.opensuse.org/projects/libstorage/ng-" +"master/sk/>\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,35 +35,36 @@ #. %1$s is replaced by logical volume name (e.g. root), #. %2$s is replaced by size (e.g. 2GiB), #. %3$s is replaced by volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "Activate thin logical volume %1$s (%2$s) on volume group %3$s" -msgstr "Aktivovanie logického zväzku %1$s (%2$s) na skupine zväzkov %3$s" +msgstr "Aktivovať tenký logický zväzok %1$s (%2$s) na skupine zväzkov %3$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by logical volume name (e.g. root), #. %2$s is replaced by size (e.g. 2GiB), #. %3$s is replaced by volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "Activate thin pool logical volume %1$s (%2$s) on volume group %3$s" -msgstr "Aktivovanie logického zväzku %1$s (%2$s) na skupine zväzkov %3$s" +msgstr "" +"Aktivovať tenký logický zväzok fondu %1$s (%2$s) na skupine zväzkov %3$s" #. TRANSLATORS: progress message #, c-format msgid "Activating LUKS %s" -msgstr "" +msgstr "Aktivovanie LUKS %s" #. TRANSLATORS: error message #, c-format msgid "Activating LUKS %s failed" -msgstr "" +msgstr "Aktivovanie LUKS %s zlyhalo" #. TRANSLATORS: progress message msgid "Activating LVM" -msgstr "" +msgstr "Aktivovanie LVM" #. TRANSLATORS: error message msgid "Activating LVM failed" -msgstr "" +msgstr "Aktivovanie LVM zlyhalo" #. TRANSLATORS: displayed during action, #. %1$s is replaced by device name (e.g. /dev/sda1) @@ -79,30 +81,31 @@ msgstr "Aktivovanie logického zväzku %1$s (%2$s) na skupine zväzkov %3$s" #. TRANSLATORS: progress message -#, fuzzy msgid "Activating multipath" -msgstr "Deaktivovanie multipath %1$s (%2$s)" +msgstr "Aktivovanie multipath" #. TRANSLATORS: error message -#, fuzzy msgid "Activating multipath failed" -msgstr "Deaktivovanie multipath %1$s (%2$s)" +msgstr "Aktivovanie multipath zlyhalo" #. TRANSLATORS: displayed during action, #. %1$s is replaced by logical volume name (e.g. root), #. %2$s is replaced by size (e.g. 2GiB), #. %3$s is replaced by volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "Activating thin logical volume %1$s (%2$s) on volume group %3$s" -msgstr "Aktivovanie logického zväzku %1$s (%2$s) na skupine zväzkov %3$s" +msgstr "" +"Aktivovanie tenkého logického zväzku %1$s (%2$s) na skupine zväzkov %3$s" #. TRANSLATORS: displayed during action, #. %1$s is replaced by logical volume name (e.g. root), #. %2$s is replaced by size (e.g. 2GiB), #. %3$s is replaced by volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "Activating thin pool logical volume %1$s (%2$s) on volume group %3$s" -msgstr "Aktivovanie logického zväzku %1$s (%2$s) na skupine zväzkov %3$s" +msgstr "" +"Aktivovanie tenkého logického zväzku fondu %1$s (%2$s) na skupine zväzkov " +"%3$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sdd), @@ -272,9 +275,9 @@ #. %1$s is replaced by logical volume name (e.g. root), #. %2$s is replaced by size (e.g. 2GiB), #. %3$s is replaced by volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "Create LVM logical volume %1$s (%2$s) on volume group %3$s" -msgstr "Vytvoriť logický zväzok %1$s (%2$s) na skupine zväzkov %3$s" +msgstr "Vytvoriť logický zväzok LVM %1$s (%2$s) na skupine zväzkov %3$s" #. TRANSLATORS: #. %1$s is replaced by logical volume name (e.g. root), @@ -282,33 +285,36 @@ #. %3$s is replaced by volume group name (e.g. system), #. %4$s is replaced by mount point (e.g. /home), #. %5$s is replaced by file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "Create LVM logical volume %1$s (%2$s) on volume group %3$s for %4$s with %5$s" -msgstr "Vytvoriť logický zväzok %1$s (%2$s) na skupine zväzkov %3$s" +msgstr "" +"Vytvoriť logický zväzok LVM %1$s (%2$s) na skupine zväzkov %3$s pre %4$s s " +"%5$s" #. TRANSLATORS: #. %1$s is replaced by logical volume name (e.g. root), #. %2$s is replaced by size (e.g. 2GiB), #. %3$s is replaced by volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "Create LVM logical volume %1$s (%2$s) on volume group %3$s for swap" -msgstr "Vytvoriť logický zväzok %1$s (%2$s) na skupine zväzkov %3$s" +msgstr "" +"Vytvoriť logický zväzok LVM %1$s (%2$s) na skupine zväzkov %3$s pre swap" #. TRANSLATORS: #. %1$s is replaced by logical volume name (e.g. root), #. %2$s is replaced by size (e.g. 2GiB), #. %3$s is replaced by volume group name (e.g. system), #. %4$s is replaced by file system name (e.g. ext4) -#, fuzzy, c-format +#, c-format msgid "Create LVM logical volume %1$s (%2$s) on volume group %3$s with %4$s" -msgstr "Vytvoriť logický zväzok %1$s (%2$s) na skupine zväzkov %3$s" +msgstr "Vytvoriť logický zväzok swap %1$s (%2$s) na skupine zväzkov %3$s s %4$s" #. TRANSLATORS: #. %1$s is replaced by partition name (e.g. /dev/sda1), #. %2$s is replaced by size (e.g. 2GiB) -#, fuzzy, c-format +#, c-format msgid "Create LVM physical volume over encrypted %1$s (%2$s)" -msgstr "Vytvoriť fyzický zväzok na %1$s" +msgstr "Vytvoriť fyzický zväzok LVM cez šifrovaný %1$s (%2$s)" #. TRANSLATORS: #. %1$s is replaced by partition name (e.g. /dev/sda1), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/storage/EtcFstab.cc new/libstorage-ng-3.3.269/storage/EtcFstab.cc --- old/libstorage-ng-3.3.262/storage/EtcFstab.cc 2018-04-30 10:25:41.000000000 +0200 +++ new/libstorage-ng-3.3.269/storage/EtcFstab.cc 2018-05-05 18:43:13.000000000 +0200 @@ -658,7 +658,12 @@ mount_point->get_impl().set_fstab_device_name(fstab_entry->get_device()); mount_point->set_mount_by(get_mount_by()); - mount_point->set_mount_type(get_fs_type()); + + // In some cases the fs_type is unknown, e.g. a NTFS included in + // /proc/mounts (as fuseblk) but not in /etc/fstab. + if (get_fs_type() != FsType::UNKNOWN) + mount_point->set_mount_type(get_fs_type()); + mount_point->set_mount_options(get_mount_options()); mount_point->set_in_etc_fstab(is_in_etc_fstab()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/storage/Filesystems/Mountable.h new/libstorage-ng-3.3.269/storage/Filesystems/Mountable.h --- old/libstorage-ng-3.3.262/storage/Filesystems/Mountable.h 2018-04-30 10:25:41.000000000 +0200 +++ new/libstorage-ng-3.3.269/storage/Filesystems/Mountable.h 2018-05-05 18:43:13.000000000 +0200 @@ -40,7 +40,7 @@ enum class FsType { UNKNOWN, AUTO, REISERFS, EXT2, EXT3, EXT4, BTRFS, VFAT, XFS, JFS, HFS, NTFS, - SWAP, HFSPLUS, NFS, NFS4, TMPFS, ISO9660, UDF, NILFS2, MINIX + SWAP, HFSPLUS, NFS, NFS4, TMPFS, ISO9660, UDF, NILFS2, MINIX, NTFS3G }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/storage/Filesystems/MountableImpl.cc new/libstorage-ng-3.3.269/storage/Filesystems/MountableImpl.cc --- old/libstorage-ng-3.3.262/storage/Filesystems/MountableImpl.cc 2018-04-30 10:25:41.000000000 +0200 +++ new/libstorage-ng-3.3.269/storage/Filesystems/MountableImpl.cc 2018-05-05 18:43:13.000000000 +0200 @@ -50,10 +50,12 @@ // Strings must match /etc/fstab and output of blkid - hopefully they are - // always the same. + // always the same. Some names are not used in the output of blkid, + // e.g. unknown, auto, tmpfs and ntfs-3g. const vector<string> EnumTraits<FsType>::names({ "unknown", "auto", "reiserfs", "ext2", "ext3", "ext4", "btrfs", "vfat", "xfs", "jfs", "hfs", - "ntfs", "swap", "hfsplus", "nfs", "nfs4", "tmpfs", "iso9660", "udf", "nilfs2", "minix" + "ntfs", "swap", "hfsplus", "nfs", "nfs4", "tmpfs", "iso9660", "udf", "nilfs2", "minix", + "ntfs-3g" }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/testsuite/probe/Makefile.am new/libstorage-ng-3.3.269/testsuite/probe/Makefile.am --- old/libstorage-ng-3.3.262/testsuite/probe/Makefile.am 2018-04-30 10:25:41.000000000 +0200 +++ new/libstorage-ng-3.3.269/testsuite/probe/Makefile.am 2018-05-05 18:43:13.000000000 +0200 @@ -13,7 +13,7 @@ lvm+luks1.test luks1.test luks2.test \ bcache1.test btrfs1.test dasd1.test dasd2.test \ external-journal.test \ - dmraid1.test md-imsm1.test md-ddf1.test nfs1.test + dmraid1.test md-imsm1.test md-ddf1.test nfs1.test ntfs1.test AM_DEFAULT_SOURCE_EXT = .cc @@ -40,5 +40,6 @@ md-imsm1-mockup.xml md-imsm1-devicegraph.xml \ md-ddf1-mockup.xml md-ddf1-devicegraph.xml \ nfs1-mockup.xml nfs1-devicegraph.xml \ + ntfs1-mockup.xml ntfs1-devicegraph.xml \ external-journal-mockup.xml external-journal-devicegraph.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/testsuite/probe/ntfs1-devicegraph.xml new/libstorage-ng-3.3.269/testsuite/probe/ntfs1-devicegraph.xml --- old/libstorage-ng-3.3.262/testsuite/probe/ntfs1-devicegraph.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-3.3.269/testsuite/probe/ntfs1-devicegraph.xml 2018-05-05 18:43:13.000000000 +0200 @@ -0,0 +1,155 @@ +<?xml version="1.0"?> +<!-- generated by libstorage-ng version 3.3.254, thalassa.suse.de, 2018-05-03 08:28:11 GMT --> +<Devicegraph> + <Devices> + <Disk> + <sid>42</sid> + <name>/dev/sdc</name> + <sysfs-name>sdc</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc</sysfs-path> + <region> + <length>5860466688</length> + <block-size>512</block-size> + </region> + <udev-path>pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0</udev-path> + <udev-id>usb-WD_My_Passport_25E2_575842314436354C33384445-0:0</udev-id> + <topology/> + <range>256</range> + <rotational>true</rotational> + <transport>USB</transport> + </Disk> + <Gpt> + <sid>43</sid> + </Gpt> + <Partition> + <sid>44</sid> + <name>/dev/sdc1</name> + <sysfs-name>sdc1</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/sdc1</sysfs-path> + <region> + <start>2048</start> + <length>58603520</length> + <block-size>512</block-size> + </region> + <udev-path>pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0-part1</udev-path> + <udev-id>usb-WD_My_Passport_25E2_575842314436354C33384445-0:0-part1</udev-id> + <type>primary</type> + <id>131</id> + </Partition> + <Partition> + <sid>45</sid> + <name>/dev/sdc2</name> + <sysfs-name>sdc2</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/sdc2</sysfs-path> + <region> + <start>58605568</start> + <length>58603520</length> + <block-size>512</block-size> + </region> + <udev-path>pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0-part2</udev-path> + <udev-id>usb-WD_My_Passport_25E2_575842314436354C33384445-0:0-part2</udev-id> + <type>primary</type> + <id>131</id> + </Partition> + <Partition> + <sid>46</sid> + <name>/dev/sdc3</name> + <sysfs-name>sdc3</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/sdc3</sysfs-path> + <region> + <start>117209088</start> + <length>58605568</length> + <block-size>512</block-size> + </region> + <udev-path>pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0-part3</udev-path> + <udev-id>usb-WD_My_Passport_25E2_575842314436354C33384445-0:0-part3</udev-id> + <type>primary</type> + <id>131</id> + </Partition> + <Ntfs> + <sid>47</sid> + <uuid>6D0EF67C257F7035</uuid> + </Ntfs> + <MountPoint> + <sid>48</sid> + <path>/test1</path> + <mount-by>device</mount-by> + <mount-type>ntfs</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + <Ntfs> + <sid>49</sid> + <uuid>172A54612F0EC61E</uuid> + </Ntfs> + <MountPoint> + <sid>50</sid> + <path>/test2</path> + <mount-by>device</mount-by> + <mount-type>ntfs-3g</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + <Ntfs> + <sid>51</sid> + <uuid>3C03540236D27F38</uuid> + </Ntfs> + <MountPoint> + <sid>52</sid> + <path>/test3</path> + <mount-by>device</mount-by> + <mount-options>rw,nosuid,nodev,relatime,user_id=0,group_id=0,allow_other,blksize=4096</mount-options> + <mount-type>ntfs</mount-type> + <active>true</active> + <in-etc-fstab>false</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + </Devices> + <Holders> + <User> + <source-sid>42</source-sid> + <target-sid>43</target-sid> + </User> + <Subdevice> + <source-sid>43</source-sid> + <target-sid>44</target-sid> + </Subdevice> + <Subdevice> + <source-sid>43</source-sid> + <target-sid>45</target-sid> + </Subdevice> + <Subdevice> + <source-sid>43</source-sid> + <target-sid>46</target-sid> + </Subdevice> + <FilesystemUser> + <source-sid>44</source-sid> + <target-sid>47</target-sid> + </FilesystemUser> + <User> + <source-sid>47</source-sid> + <target-sid>48</target-sid> + </User> + <FilesystemUser> + <source-sid>45</source-sid> + <target-sid>49</target-sid> + </FilesystemUser> + <User> + <source-sid>49</source-sid> + <target-sid>50</target-sid> + </User> + <FilesystemUser> + <source-sid>46</source-sid> + <target-sid>51</target-sid> + </FilesystemUser> + <User> + <source-sid>51</source-sid> + <target-sid>52</target-sid> + </User> + </Holders> +</Devicegraph> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/testsuite/probe/ntfs1-mockup.xml new/libstorage-ng-3.3.269/testsuite/probe/ntfs1-mockup.xml --- old/libstorage-ng-3.3.262/testsuite/probe/ntfs1-mockup.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-3.3.269/testsuite/probe/ntfs1-mockup.xml 2018-05-05 18:43:13.000000000 +0200 @@ -0,0 +1,356 @@ +<?xml version="1.0"?> +<!-- generated by libstorage-ng version 3.3.254, thalassa.suse.de, 2018-05-03 08:19:17 GMT --> +<Mockup> + <Commands> + <Command> + <name>/bin/ls -1 --sort=none '/sys/block'</name> + <stdout>sdc</stdout> + </Command> + <Command> + <name>/sbin/blkid -c '/dev/null'</name> + <stdout>/dev/sdc1: UUID="6D0EF67C257F7035" TYPE="ntfs" PARTUUID="69b45287-55e4-4365-aacb-fc154be9d848"</stdout> + <stdout>/dev/sdc2: UUID="172A54612F0EC61E" TYPE="ntfs" PARTUUID="ed234211-acfd-4e4b-b417-94f9b90ae8b5"</stdout> + <stdout>/dev/sdc3: UUID="3C03540236D27F38" TYPE="ntfs" PARTUUID="42186f98-cd68-4aa7-916f-c53aea3b22ad"</stdout> + </Command> + <Command> + <name>/sbin/dmraid --sets=active -ccc</name> + <stdout>no raid disks</stdout> + <exit-code>1</exit-code> + </Command> + <Command> + <name>/sbin/multipath -d -v 2 -ll</name> + </Command> + <Command> + <name>/sbin/udevadm info '/dev/sdc'</name> + <stdout>P: /devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc</stdout> + <stdout>N: sdc</stdout> + <stdout>S: disk/by-id/usb-WD_My_Passport_25E2_575842314436354C33384445-0:0</stdout> + <stdout>S: disk/by-path/pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0</stdout> + <stdout>E: DEVLINKS=/dev/disk/by-path/pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0 /dev/disk/by-id/usb-WD_My_Passport_25E2_575842314436354C33384445-0:0</stdout> + <stdout>E: DEVNAME=/dev/sdc</stdout> + <stdout>E: DEVPATH=/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc</stdout> + <stdout>E: DEVTYPE=disk</stdout> + <stdout>E: DONT_DEL_PART_NODES=1</stdout> + <stdout>E: ID_BUS=usb</stdout> + <stdout>E: ID_INSTANCE=0:0</stdout> + <stdout>E: ID_MODEL=My_Passport_25E2</stdout> + <stdout>E: ID_MODEL_ENC=My\x20Passport\x2025E2</stdout> + <stdout>E: ID_MODEL_ID=25e2</stdout> + <stdout>E: ID_PART_TABLE_TYPE=gpt</stdout> + <stdout>E: ID_PART_TABLE_UUID=494f47eb-e270-4f56-aeb1-a5c7dc4885eb</stdout> + <stdout>E: ID_PATH=pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0</stdout> + <stdout>E: ID_PATH_TAG=pci-0000_00_1a_0-usb-0_1_6_1_0-scsi-0_0_0_0</stdout> + <stdout>E: ID_REVISION=4004</stdout> + <stdout>E: ID_SCSI=1</stdout> + <stdout>E: ID_SCSI_INQUIRY=1</stdout> + <stdout>E: ID_SERIAL=WD_My_Passport_25E2_575842314436354C33384445-0:0</stdout> + <stdout>E: ID_SERIAL_SHORT=575842314436354C33384445</stdout> + <stdout>E: ID_TYPE=disk</stdout> + <stdout>E: ID_USB_DRIVER=usb-storage</stdout> + <stdout>E: ID_USB_INTERFACES=:080650:</stdout> + <stdout>E: ID_USB_INTERFACE_NUM=00</stdout> + <stdout>E: ID_VENDOR=WD</stdout> + <stdout>E: ID_VENDOR_ENC=WD\x20\x20\x20\x20\x20\x20</stdout> + <stdout>E: ID_VENDOR_ID=1058</stdout> + <stdout>E: MAJOR=8</stdout> + <stdout>E: MINOR=32</stdout> + <stdout>E: MPATH_SBIN_PATH=/sbin</stdout> + <stdout>E: SCSI_MODEL=My_Passport_25E2</stdout> + <stdout>E: SCSI_MODEL_ENC=My\x20Passport\x2025E2</stdout> + <stdout>E: SCSI_REVISION=4004</stdout> + <stdout>E: SCSI_TPGS=0</stdout> + <stdout>E: SCSI_TYPE=disk</stdout> + <stdout>E: SCSI_VENDOR=WD</stdout> + <stdout>E: SCSI_VENDOR_ENC=WD\x20\x20\x20\x20\x20\x20</stdout> + <stdout>E: SUBSYSTEM=block</stdout> + <stdout>E: TAGS=:systemd:</stdout> + <stdout>E: USEC_INITIALIZED=23903860</stdout> + <stdout></stdout> + </Command> + <Command> + <name>/sbin/udevadm info '/dev/sdc1'</name> + <stdout>P: /devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/sdc1</stdout> + <stdout>N: sdc1</stdout> + <stdout>S: disk/by-id/usb-WD_My_Passport_25E2_575842314436354C33384445-0:0-part1</stdout> + <stdout>S: disk/by-partuuid/69b45287-55e4-4365-aacb-fc154be9d848</stdout> + <stdout>S: disk/by-path/pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0-part1</stdout> + <stdout>S: disk/by-uuid/6D0EF67C257F7035</stdout> + <stdout>E: DEVLINKS=/dev/disk/by-id/usb-WD_My_Passport_25E2_575842314436354C33384445-0:0-part1 /dev/disk/by-partuuid/69b45287-55e4-4365-aacb-fc154be9d848 /dev/disk/by-uuid/6D0EF67C257F7035 /dev/disk/by-path/pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0-part1</stdout> + <stdout>E: DEVNAME=/dev/sdc1</stdout> + <stdout>E: DEVPATH=/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/sdc1</stdout> + <stdout>E: DEVTYPE=partition</stdout> + <stdout>E: DONT_DEL_PART_NODES=1</stdout> + <stdout>E: ID_BUS=usb</stdout> + <stdout>E: ID_FS_TYPE=ntfs</stdout> + <stdout>E: ID_FS_USAGE=filesystem</stdout> + <stdout>E: ID_FS_UUID=6D0EF67C257F7035</stdout> + <stdout>E: ID_FS_UUID_ENC=6D0EF67C257F7035</stdout> + <stdout>E: ID_INSTANCE=0:0</stdout> + <stdout>E: ID_MODEL=My_Passport_25E2</stdout> + <stdout>E: ID_MODEL_ENC=My\x20Passport\x2025E2</stdout> + <stdout>E: ID_MODEL_ID=25e2</stdout> + <stdout>E: ID_PART_ENTRY_DISK=8:32</stdout> + <stdout>E: ID_PART_ENTRY_NUMBER=1</stdout> + <stdout>E: ID_PART_ENTRY_OFFSET=2048</stdout> + <stdout>E: ID_PART_ENTRY_SCHEME=gpt</stdout> + <stdout>E: ID_PART_ENTRY_SIZE=58603520</stdout> + <stdout>E: ID_PART_ENTRY_TYPE=0fc63daf-8483-4772-8e79-3d69d8477de4</stdout> + <stdout>E: ID_PART_ENTRY_UUID=69b45287-55e4-4365-aacb-fc154be9d848</stdout> + <stdout>E: ID_PART_TABLE_TYPE=gpt</stdout> + <stdout>E: ID_PART_TABLE_UUID=494f47eb-e270-4f56-aeb1-a5c7dc4885eb</stdout> + <stdout>E: ID_PATH=pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0</stdout> + <stdout>E: ID_PATH_TAG=pci-0000_00_1a_0-usb-0_1_6_1_0-scsi-0_0_0_0</stdout> + <stdout>E: ID_REVISION=4004</stdout> + <stdout>E: ID_SCSI=1</stdout> + <stdout>E: ID_SCSI_INQUIRY=1</stdout> + <stdout>E: ID_SERIAL=WD_My_Passport_25E2_575842314436354C33384445-0:0</stdout> + <stdout>E: ID_SERIAL_SHORT=575842314436354C33384445</stdout> + <stdout>E: ID_TYPE=disk</stdout> + <stdout>E: ID_USB_DRIVER=usb-storage</stdout> + <stdout>E: ID_USB_INTERFACES=:080650:</stdout> + <stdout>E: ID_USB_INTERFACE_NUM=00</stdout> + <stdout>E: ID_VENDOR=WD</stdout> + <stdout>E: ID_VENDOR_ENC=WD\x20\x20\x20\x20\x20\x20</stdout> + <stdout>E: ID_VENDOR_ID=1058</stdout> + <stdout>E: MAJOR=8</stdout> + <stdout>E: MINOR=33</stdout> + <stdout>E: PARTN=1</stdout> + <stdout>E: SCSI_MODEL=My_Passport_25E2</stdout> + <stdout>E: SCSI_MODEL_ENC=My\x20Passport\x2025E2</stdout> + <stdout>E: SCSI_REVISION=4004</stdout> + <stdout>E: SCSI_TPGS=0</stdout> + <stdout>E: SCSI_TYPE=disk</stdout> + <stdout>E: SCSI_VENDOR=WD</stdout> + <stdout>E: SCSI_VENDOR_ENC=WD\x20\x20\x20\x20\x20\x20</stdout> + <stdout>E: SUBSYSTEM=block</stdout> + <stdout>E: TAGS=:systemd:</stdout> + <stdout>E: USEC_INITIALIZED=726397226758</stdout> + <stdout></stdout> + </Command> + <Command> + <name>/sbin/udevadm info '/dev/sdc2'</name> + <stdout>P: /devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/sdc2</stdout> + <stdout>N: sdc2</stdout> + <stdout>S: disk/by-id/usb-WD_My_Passport_25E2_575842314436354C33384445-0:0-part2</stdout> + <stdout>S: disk/by-partuuid/ed234211-acfd-4e4b-b417-94f9b90ae8b5</stdout> + <stdout>S: disk/by-path/pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0-part2</stdout> + <stdout>S: disk/by-uuid/172A54612F0EC61E</stdout> + <stdout>E: DEVLINKS=/dev/disk/by-path/pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0-part2 /dev/disk/by-id/usb-WD_My_Passport_25E2_575842314436354C33384445-0:0-part2 /dev/disk/by-partuuid/ed234211-acfd-4e4b-b417-94f9b90ae8b5 /dev/disk/by-uuid/172A54612F0EC61E</stdout> + <stdout>E: DEVNAME=/dev/sdc2</stdout> + <stdout>E: DEVPATH=/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/sdc2</stdout> + <stdout>E: DEVTYPE=partition</stdout> + <stdout>E: DONT_DEL_PART_NODES=1</stdout> + <stdout>E: ID_BUS=usb</stdout> + <stdout>E: ID_FS_TYPE=ntfs</stdout> + <stdout>E: ID_FS_USAGE=filesystem</stdout> + <stdout>E: ID_FS_UUID=172A54612F0EC61E</stdout> + <stdout>E: ID_FS_UUID_ENC=172A54612F0EC61E</stdout> + <stdout>E: ID_INSTANCE=0:0</stdout> + <stdout>E: ID_MODEL=My_Passport_25E2</stdout> + <stdout>E: ID_MODEL_ENC=My\x20Passport\x2025E2</stdout> + <stdout>E: ID_MODEL_ID=25e2</stdout> + <stdout>E: ID_PART_ENTRY_DISK=8:32</stdout> + <stdout>E: ID_PART_ENTRY_NUMBER=2</stdout> + <stdout>E: ID_PART_ENTRY_OFFSET=58605568</stdout> + <stdout>E: ID_PART_ENTRY_SCHEME=gpt</stdout> + <stdout>E: ID_PART_ENTRY_SIZE=58603520</stdout> + <stdout>E: ID_PART_ENTRY_TYPE=0fc63daf-8483-4772-8e79-3d69d8477de4</stdout> + <stdout>E: ID_PART_ENTRY_UUID=ed234211-acfd-4e4b-b417-94f9b90ae8b5</stdout> + <stdout>E: ID_PART_TABLE_TYPE=gpt</stdout> + <stdout>E: ID_PART_TABLE_UUID=494f47eb-e270-4f56-aeb1-a5c7dc4885eb</stdout> + <stdout>E: ID_PATH=pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0</stdout> + <stdout>E: ID_PATH_TAG=pci-0000_00_1a_0-usb-0_1_6_1_0-scsi-0_0_0_0</stdout> + <stdout>E: ID_REVISION=4004</stdout> + <stdout>E: ID_SCSI=1</stdout> + <stdout>E: ID_SCSI_INQUIRY=1</stdout> + <stdout>E: ID_SERIAL=WD_My_Passport_25E2_575842314436354C33384445-0:0</stdout> + <stdout>E: ID_SERIAL_SHORT=575842314436354C33384445</stdout> + <stdout>E: ID_TYPE=disk</stdout> + <stdout>E: ID_USB_DRIVER=usb-storage</stdout> + <stdout>E: ID_USB_INTERFACES=:080650:</stdout> + <stdout>E: ID_USB_INTERFACE_NUM=00</stdout> + <stdout>E: ID_VENDOR=WD</stdout> + <stdout>E: ID_VENDOR_ENC=WD\x20\x20\x20\x20\x20\x20</stdout> + <stdout>E: ID_VENDOR_ID=1058</stdout> + <stdout>E: MAJOR=8</stdout> + <stdout>E: MINOR=34</stdout> + <stdout>E: PARTN=2</stdout> + <stdout>E: SCSI_MODEL=My_Passport_25E2</stdout> + <stdout>E: SCSI_MODEL_ENC=My\x20Passport\x2025E2</stdout> + <stdout>E: SCSI_REVISION=4004</stdout> + <stdout>E: SCSI_TPGS=0</stdout> + <stdout>E: SCSI_TYPE=disk</stdout> + <stdout>E: SCSI_VENDOR=WD</stdout> + <stdout>E: SCSI_VENDOR_ENC=WD\x20\x20\x20\x20\x20\x20</stdout> + <stdout>E: SUBSYSTEM=block</stdout> + <stdout>E: TAGS=:systemd:</stdout> + <stdout>E: USEC_INITIALIZED=774703748229</stdout> + <stdout></stdout> + </Command> + <Command> + <name>/sbin/udevadm info '/dev/sdc3'</name> + <stdout>P: /devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/sdc3</stdout> + <stdout>N: sdc3</stdout> + <stdout>S: disk/by-id/usb-WD_My_Passport_25E2_575842314436354C33384445-0:0-part3</stdout> + <stdout>S: disk/by-partuuid/42186f98-cd68-4aa7-916f-c53aea3b22ad</stdout> + <stdout>S: disk/by-path/pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0-part3</stdout> + <stdout>S: disk/by-uuid/3C03540236D27F38</stdout> + <stdout>E: DEVLINKS=/dev/disk/by-partuuid/42186f98-cd68-4aa7-916f-c53aea3b22ad /dev/disk/by-path/pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0-part3 /dev/disk/by-id/usb-WD_My_Passport_25E2_575842314436354C33384445-0:0-part3 /dev/disk/by-uuid/3C03540236D27F38</stdout> + <stdout>E: DEVNAME=/dev/sdc3</stdout> + <stdout>E: DEVPATH=/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/sdc3</stdout> + <stdout>E: DEVTYPE=partition</stdout> + <stdout>E: DONT_DEL_PART_NODES=1</stdout> + <stdout>E: ID_BUS=usb</stdout> + <stdout>E: ID_FS_TYPE=ntfs</stdout> + <stdout>E: ID_FS_USAGE=filesystem</stdout> + <stdout>E: ID_FS_UUID=3C03540236D27F38</stdout> + <stdout>E: ID_FS_UUID_ENC=3C03540236D27F38</stdout> + <stdout>E: ID_INSTANCE=0:0</stdout> + <stdout>E: ID_MODEL=My_Passport_25E2</stdout> + <stdout>E: ID_MODEL_ENC=My\x20Passport\x2025E2</stdout> + <stdout>E: ID_MODEL_ID=25e2</stdout> + <stdout>E: ID_PART_ENTRY_DISK=8:32</stdout> + <stdout>E: ID_PART_ENTRY_NUMBER=3</stdout> + <stdout>E: ID_PART_ENTRY_OFFSET=117209088</stdout> + <stdout>E: ID_PART_ENTRY_SCHEME=gpt</stdout> + <stdout>E: ID_PART_ENTRY_SIZE=58605568</stdout> + <stdout>E: ID_PART_ENTRY_TYPE=0fc63daf-8483-4772-8e79-3d69d8477de4</stdout> + <stdout>E: ID_PART_ENTRY_UUID=42186f98-cd68-4aa7-916f-c53aea3b22ad</stdout> + <stdout>E: ID_PART_TABLE_TYPE=gpt</stdout> + <stdout>E: ID_PART_TABLE_UUID=494f47eb-e270-4f56-aeb1-a5c7dc4885eb</stdout> + <stdout>E: ID_PATH=pci-0000:00:1a.0-usb-0:1.6:1.0-scsi-0:0:0:0</stdout> + <stdout>E: ID_PATH_TAG=pci-0000_00_1a_0-usb-0_1_6_1_0-scsi-0_0_0_0</stdout> + <stdout>E: ID_REVISION=4004</stdout> + <stdout>E: ID_SCSI=1</stdout> + <stdout>E: ID_SCSI_INQUIRY=1</stdout> + <stdout>E: ID_SERIAL=WD_My_Passport_25E2_575842314436354C33384445-0:0</stdout> + <stdout>E: ID_SERIAL_SHORT=575842314436354C33384445</stdout> + <stdout>E: ID_TYPE=disk</stdout> + <stdout>E: ID_USB_DRIVER=usb-storage</stdout> + <stdout>E: ID_USB_INTERFACES=:080650:</stdout> + <stdout>E: ID_USB_INTERFACE_NUM=00</stdout> + <stdout>E: ID_VENDOR=WD</stdout> + <stdout>E: ID_VENDOR_ENC=WD\x20\x20\x20\x20\x20\x20</stdout> + <stdout>E: ID_VENDOR_ID=1058</stdout> + <stdout>E: MAJOR=8</stdout> + <stdout>E: MINOR=35</stdout> + <stdout>E: PARTN=3</stdout> + <stdout>E: SCSI_MODEL=My_Passport_25E2</stdout> + <stdout>E: SCSI_MODEL_ENC=My\x20Passport\x2025E2</stdout> + <stdout>E: SCSI_REVISION=4004</stdout> + <stdout>E: SCSI_TPGS=0</stdout> + <stdout>E: SCSI_TYPE=disk</stdout> + <stdout>E: SCSI_VENDOR=WD</stdout> + <stdout>E: SCSI_VENDOR_ENC=WD\x20\x20\x20\x20\x20\x20</stdout> + <stdout>E: SUBSYSTEM=block</stdout> + <stdout>E: TAGS=:systemd:</stdout> + <stdout>E: USEC_INITIALIZED=774715161487</stdout> + <stdout></stdout> + </Command> + <Command> + <name>/sbin/udevadm settle --timeout=20</name> + </Command> + <Command> + <name>/usr/bin/getconf PAGESIZE</name> + <stdout>4096</stdout> + </Command> + <Command> + <name>/usr/bin/lsscsi --transport</name> + <stdout>[7:0:0:0] disk usb:1-1.6:1.0 /dev/sdc </stdout> + <stdout>[7:0:0:1] enclosu usb:1-1.6:1.0 - </stdout> + </Command> + <Command> + <name>/usr/bin/stat --format '%f' '/dev/sdc'</name> + <stdout>61b0</stdout> + </Command> + <Command> + <name>/usr/bin/test -d '/sys/firmware/efi/vars'</name> + <exit-code>1</exit-code> + </Command> + <Command> + <name>/usr/bin/uname -m</name> + <stdout>x86_64</stdout> + </Command> + <Command> + <name>/usr/sbin/parted --script --machine '/dev/sdc' unit s print</name> + <stdout>BYT;</stdout> + <stdout>/dev/sdc:5860466688s:scsi:512:4096:gpt:WD My Passport 25E2:;</stdout> + <stdout>1:2048s:58605567s:58603520s:ntfs::;</stdout> + <stdout>2:58605568s:117209087s:58603520s:ntfs::;</stdout> + <stdout>3:117209088s:175814655s:58605568s:ntfs::;</stdout> + </Command> + </Commands> + <Files> + <File> + <name>/etc/fstab</name> + <content>/dev/sdc1 /test1 ntfs defaults 0 0</content> + <content>/dev/sdc2 /test2 ntfs-3g defaults 0 0</content> + </File> + <File> + <name>/proc/mounts</name> + <content>sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0</content> + <content>proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0</content> + <content>devtmpfs /dev devtmpfs rw,nosuid,size=2998592k,nr_inodes=749648,mode=755 0 0</content> + <content>securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0</content> + <content>tmpfs /dev/shm tmpfs rw,nosuid,nodev 0 0</content> + <content>devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0</content> + <content>tmpfs /run tmpfs rw,nosuid,nodev,mode=755 0 0</content> + <content>tmpfs /sys/fs/cgroup tmpfs ro,nosuid,nodev,noexec,mode=755 0 0</content> + <content>cgroup /sys/fs/cgroup/unified cgroup2 rw,nosuid,nodev,noexec,relatime,nsdelegate 0 0</content> + <content>cgroup /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,xattr,name=systemd 0 0</content> + <content>pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0 0</content> + <content>cgroup /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0</content> + <content>cgroup /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0</content> + <content>cgroup /sys/fs/cgroup/net_cls,net_prio cgroup rw,nosuid,nodev,noexec,relatime,net_cls,net_prio 0 0</content> + <content>cgroup /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0</content> + <content>cgroup /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0</content> + <content>cgroup /sys/fs/cgroup/pids cgroup rw,nosuid,nodev,noexec,relatime,pids 0 0</content> + <content>cgroup /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0</content> + <content>cgroup /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0</content> + <content>cgroup /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0</content> + <content>cgroup /sys/fs/cgroup/rdma cgroup rw,nosuid,nodev,noexec,relatime,rdma 0 0</content> + <content>cgroup /sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpu,cpuacct 0 0</content> + <content>systemd-1 /proc/sys/fs/binfmt_misc autofs rw,relatime,fd=39,pgrp=1,timeout=0,minproto=5,maxproto=5,direct,pipe_ino=3291 0 0</content> + <content>mqueue /dev/mqueue mqueue rw,relatime 0 0</content> + <content>hugetlbfs /dev/hugepages hugetlbfs rw,relatime,pagesize=2M 0 0</content> + <content>debugfs /sys/kernel/debug debugfs rw,relatime 0 0</content> + <content>binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,relatime 0 0</content> + <content>tmpfs /run/user/10176 tmpfs rw,nosuid,nodev,relatime,size=601256k,mode=700,uid=10176,gid=50 0 0</content> + <content>fusectl /sys/fs/fuse/connections fusectl rw,relatime 0 0</content> + <content>gvfsd-fuse /run/user/10176/gvfs fuse.gvfsd-fuse rw,nosuid,nodev,relatime,user_id=10176,group_id=50 0 0</content> + <content>tracefs /sys/kernel/debug/tracing tracefs rw,relatime 0 0</content> + <content>tmpfs /run/user/0 tmpfs rw,nosuid,nodev,relatime,size=601256k,mode=700 0 0</content> + <content>/dev/sdc1 /test1 fuseblk rw,nosuid,nodev,relatime,user_id=0,group_id=0,allow_other,blksize=4096 0 0</content> + <content>/dev/sdc2 /test2 fuseblk rw,nosuid,nodev,relatime,user_id=0,group_id=0,allow_other,blksize=4096 0 0</content> + <content>/dev/sdc3 /test3 fuseblk rw,nosuid,nodev,relatime,user_id=0,group_id=0,allow_other,blksize=4096 0 0</content> + </File> + <File> + <name>/proc/swaps</name> + <content>Filename Type Size Used Priority</content> + </File> + <File> + <name>/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/alignment_offset</name> + <content>0</content> + </File> + <File> + <name>/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/ext_range</name> + <content>256</content> + </File> + <File> + <name>/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/queue/logical_block_size</name> + <content>512</content> + </File> + <File> + <name>/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/queue/optimal_io_size</name> + <content>0</content> + </File> + <File> + <name>/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/queue/rotational</name> + <content>1</content> + </File> + <File> + <name>/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.6/1-1.6:1.0/host7/target7:0:0/7:0:0:0/block/sdc/size</name> + <content>5860466688</content> + </File> + </Files> +</Mockup> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-3.3.262/testsuite/probe/ntfs1.cc new/libstorage-ng-3.3.269/testsuite/probe/ntfs1.cc --- old/libstorage-ng-3.3.262/testsuite/probe/ntfs1.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-3.3.269/testsuite/probe/ntfs1.cc 2018-05-05 18:43:13.000000000 +0200 @@ -0,0 +1,41 @@ + +#define BOOST_TEST_DYN_LINK +#define BOOST_TEST_MODULE libstorage + +#include <iostream> +#include <boost/test/unit_test.hpp> + +#include "storage/Environment.h" +#include "storage/Storage.h" +#include "storage/DevicegraphImpl.h" +#include "storage/UsedFeatures.h" + +#include "testsuite/helpers/TsCmp.h" + + +using namespace std; +using namespace storage; + + +BOOST_AUTO_TEST_CASE(probe) +{ + set_logger(get_stdout_logger()); + + Environment environment(true, ProbeMode::READ_MOCKUP, TargetMode::DIRECT); + environment.set_mockup_filename("ntfs1-mockup.xml"); + + Storage storage(environment); + storage.probe(); + + const Devicegraph* probed = storage.get_probed(); + probed->check(); + + Devicegraph* staging = storage.get_staging(); + staging->load("ntfs1-devicegraph.xml"); + staging->check(); + + TsCmpDevicegraph cmp(*probed, *staging); + BOOST_CHECK_MESSAGE(cmp.ok(), cmp); + + BOOST_CHECK_BITWISE_EQUAL(probed->used_features(), (uint64_t)(UF_NTFS)); +}