Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libstorage-ng for openSUSE:Factory
checked in at 2021-12-01 20:46:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old)
and /work/SRC/openSUSE:Factory/.libstorage-ng.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng"
Wed Dec 1 20:46:31 2021 rev:138 rq:934969 version:4.4.61
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes
2021-11-27 00:50:56.706880635 +0100
+++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.31177/libstorage-ng.changes
2021-12-02 02:17:14.422284986 +0100
@@ -1,0 +2,23 @@
+Wed Dec 1 11:38:48 UTC 2021 - aschn...@suse.com
+
+- merge gh#openSUSE/libstorage-ng#846
+- make function is_efibootmgr() public (for bsc#937067)
+- 4.4.61
+
+--------------------------------------------------------------------
+Wed Dec 1 10:04:37 UTC 2021 - aschn...@suse.com
+
+- merge gh#openSUSE/libstorage-ng#845
+- prefer file system over empty MS-DOS partition table (bsc#1186823)
+- fixed testcase
+- 4.4.60
+
+--------------------------------------------------------------------
+Tue Nov 30 19:26:57 UTC 2021 - aschn...@suse.com
+
+- merge gh#openSUSE/libstorage-ng#844
+- extended Holder::set_source for multipath devices
+- documentation and coding style
+- 4.4.59
+
+--------------------------------------------------------------------
Old:
----
libstorage-ng-4.4.58.tar.xz
New:
----
libstorage-ng-4.4.61.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-ng.spec ++++++
--- /var/tmp/diff_new_pack.RW0z7T/_old 2021-12-02 02:17:14.814283619 +0100
+++ /var/tmp/diff_new_pack.RW0z7T/_new 2021-12-02 02:17:14.814283619 +0100
@@ -18,7 +18,7 @@
%define libname %{name}1
Name: libstorage-ng
-Version: 4.4.58
+Version: 4.4.61
Release: 0
Summary: Library for storage management
License: GPL-2.0-only
++++++ libstorage-ng-4.4.58.tar.xz -> libstorage-ng-4.4.61.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/LIBVERSION
new/libstorage-ng-4.4.61/LIBVERSION
--- old/libstorage-ng-4.4.58/LIBVERSION 2021-11-23 14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/LIBVERSION 2021-12-01 12:38:48.000000000 +0100
@@ -1 +1 @@
-1.67.0
+1.68.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/VERSION
new/libstorage-ng-4.4.61/VERSION
--- old/libstorage-ng-4.4.58/VERSION 2021-11-23 14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/VERSION 2021-12-01 12:38:48.000000000 +0100
@@ -1 +1 @@
-4.4.58
+4.4.61
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.58/storage/Devices/PartitionImpl.cc
new/libstorage-ng-4.4.61/storage/Devices/PartitionImpl.cc
--- old/libstorage-ng-4.4.58/storage/Devices/PartitionImpl.cc 2021-11-23
14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/storage/Devices/PartitionImpl.cc 2021-12-01
12:38:48.000000000 +0100
@@ -231,9 +231,9 @@
void
Partition::Impl::set_number(unsigned int number)
{
- std::pair<string, unsigned int> pair =
device_to_name_and_number(get_name());
+ const Partitionable* partitionable = get_partitionable();
- set_name(name_and_number_to_device(pair.first, number));
+ set_name(partitionable->partition_name(number));
update_sysfs_name_and_path();
update_udev_paths_and_ids();
@@ -529,7 +529,7 @@
{
const Partitionable* partitionable = get_partitionable();
- set_name(name_and_number_to_device(partitionable->get_name(),
get_number()));
+ set_name(partitionable->partition_name(get_number()));
}
@@ -538,9 +538,8 @@
{
const Partitionable* partitionable = get_partitionable();
- // TODO different for device-mapper partitions
-
- if (!partitionable->get_sysfs_name().empty() &&
!partitionable->get_sysfs_path().empty())
+ if ((!partitionable->get_sysfs_name().empty() &&
!partitionable->get_sysfs_path().empty()) &&
+ partitionable->get_dm_table_name().empty())
{
set_sysfs_name(partitionable->get_sysfs_name() +
to_string(get_number()));
set_sysfs_path(partitionable->get_sysfs_path() + "/" +
get_sysfs_name());
@@ -1268,39 +1267,13 @@
}
- // TODO move to Arch class
- static bool
- is_efibootmgr()
- {
- static bool did_check = false;
- static bool efibootmgr;
-
- if (!did_check)
- {
- // Check that efivars directory is writeable and nonempty (bsc
#1185610).
-
- SystemCmd::Options options(TEST_BIN " -w '" EFIVARS_DIR "' -a "
- "\"$(" LS_BIN " -A '" EFIVARS_DIR
"')\"", SystemCmd::DoThrow);
- options.verify = [](int exit_code) { return exit_code == 0 ||
exit_code == 1; };
-
- SystemCmd cmd(options);
-
- efibootmgr = cmd.retcode() == 0;
-
- did_check = true;
- }
-
- return efibootmgr;
- }
-
-
void
Partition::Impl::do_delete_efi_boot_mgr() const
{
if (!is_gpt(get_partition_table()))
return;
- if (!get_devicegraph()->get_storage()->get_arch().is_efiboot() ||
!is_efibootmgr())
+ if (!get_devicegraph()->get_storage()->get_arch().is_efiboot() ||
!Arch::is_efibootmgr())
return;
const Partitionable* partitionable = get_partitionable();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.58/storage/Devices/PartitionTableImpl.cc
new/libstorage-ng-4.4.61/storage/Devices/PartitionTableImpl.cc
--- old/libstorage-ng-4.4.58/storage/Devices/PartitionTableImpl.cc
2021-11-23 14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/storage/Devices/PartitionTableImpl.cc
2021-12-01 12:38:48.000000000 +0100
@@ -243,6 +243,8 @@
partition->get_impl().update_sysfs_name_and_path();
partition->get_impl().update_udev_paths_and_ids();
+ partition->set_dm_table_name("");
+
// TODO topology? at least block size? could cascade to even more
devices
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.58/storage/Devices/PartitionableImpl.cc
new/libstorage-ng-4.4.61/storage/Devices/PartitionableImpl.cc
--- old/libstorage-ng-4.4.58/storage/Devices/PartitionableImpl.cc
2021-11-23 14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/storage/Devices/PartitionableImpl.cc
2021-12-01 12:38:48.000000000 +0100
@@ -1,6 +1,6 @@
/*
* Copyright (c) [2014-2015] Novell, Inc.
- * Copyright (c) [2016-2020] SUSE LLC
+ * Copyright (c) [2016-2021] SUSE LLC
*
* All Rights Reserved.
*
@@ -38,6 +38,7 @@
#include "storage/Utils/CallbacksImpl.h"
#include "storage/SystemInfo/SystemInfoImpl.h"
#include "storage/StorageImpl.h"
+#include "storage/EnvironmentImpl.h"
#include "storage/Prober.h"
#include "storage/Utils/Format.h"
@@ -156,9 +157,24 @@
try
{
- const Parted& parted =
prober.get_system_info().getParted(get_name());
- if (parted.get_label() == PtType::MSDOS || parted.get_label() ==
PtType::GPT ||
- parted.get_label() == PtType::DASD)
+ SystemInfo::Impl& system_info = prober.get_system_info();
+
+ const Parted& parted = system_info.getParted(get_name());
+ PtType label = parted.get_label();
+
+ // Ignore MS-DOS partition table without any partitions if there is
also an
+ // filesystem - likely the partition table is in fact only the MBR
signature
+ // from instelled from grub (#see bsc #) 1186823.
+ if (label == PtType::MSDOS && parted.get_entries().empty() &&
+ prefer_filesystem_over_empty_msdos())
+ {
+ const Blkid& blkid = system_info.getBlkid();
+ Blkid::const_iterator it = blkid.find_by_any_name(get_name(),
system_info);
+ if (it != blkid.end() && it->second.is_fs)
+ return;
+ }
+
+ if (label == PtType::MSDOS || label == PtType::GPT || label ==
PtType::DASD)
{
if (get_region().get_block_size() !=
parted.get_region().get_block_size())
ST_THROW(Exception(sformat("different block size reported
by kernel and parted for %s",
@@ -168,8 +184,6 @@
ST_THROW(Exception(sformat("different size reported by
kernel and parted for %s",
get_name())));
- PtType label = parted.get_label();
-
// parted reports DASD partition table for implicit partition
// tables. Convert that to implicit partition table.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/storage/EnvironmentImpl.cc
new/libstorage-ng-4.4.61/storage/EnvironmentImpl.cc
--- old/libstorage-ng-4.4.58/storage/EnvironmentImpl.cc 2021-11-23
14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/storage/EnvironmentImpl.cc 2021-12-01
12:38:48.000000000 +0100
@@ -1,6 +1,6 @@
/*
* Copyright (c) [2014-2015] Novell, Inc.
- * Copyright (c) [2018-2020] SUSE LLC
+ * Copyright (c) [2018-2021] SUSE LLC
*
* All Rights Reserved.
*
@@ -132,4 +132,11 @@
return read_env_var("LIBSTORAGE_DEVELOPER_MODE", false);
}
+
+ bool
+ prefer_filesystem_over_empty_msdos()
+ {
+ return read_env_var("LIBSTORAGE_PFSOEMS", true);
+ }
+
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/storage/EnvironmentImpl.h
new/libstorage-ng-4.4.61/storage/EnvironmentImpl.h
--- old/libstorage-ng-4.4.58/storage/EnvironmentImpl.h 2021-11-23
14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/storage/EnvironmentImpl.h 2021-12-01
12:38:48.000000000 +0100
@@ -98,6 +98,12 @@
*/
bool developer_mode();
+ /**
+ * If there is a file system and an empty MS-DOS partition table on a
partitionable
+ * prefer the file system.
+ */
+ bool prefer_filesystem_over_empty_msdos();
+
}
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/storage/Holders/Holder.h
new/libstorage-ng-4.4.61/storage/Holders/Holder.h
--- old/libstorage-ng-4.4.58/storage/Holders/Holder.h 2021-11-23
14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/storage/Holders/Holder.h 2021-12-01
12:38:48.000000000 +0100
@@ -72,8 +72,10 @@
/**
* Set the source device of the holder. Experimental.
*
+ * The new source must not be the old source.
+ *
* So far it is undefined whether this function adjusts the devices
connected to
- * the holder. E.g. setting a disk as source for a partition table
adjusts the
+ * the holder. E.g. setting a disk as source for a partition table
adjusts the
* device names of the partitions but not the topology. This may change
in the
* future.
*
@@ -84,6 +86,8 @@
/**
* Set the target device of the holder.
*
+ * The new target must not be the old target.
+ *
* @see set_source(const Device*)
*
* @throw Exception
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/storage/SystemInfo/Arch.cc
new/libstorage-ng-4.4.61/storage/SystemInfo/Arch.cc
--- old/libstorage-ng-4.4.58/storage/SystemInfo/Arch.cc 2021-11-23
14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/storage/SystemInfo/Arch.cc 2021-12-01
12:38:48.000000000 +0100
@@ -171,6 +171,33 @@
}
+ bool
+ Arch::is_efibootmgr()
+ {
+ // TODO move efibootmgr to Arch class - but breaks ABI
+
+ static bool did_check = false;
+ static bool efibootmgr;
+
+ if (!did_check)
+ {
+ // Check that efivars directory is writeable and nonempty (bsc
#1185610).
+
+ SystemCmd::Options options(TEST_BIN " -w '" EFIVARS_DIR "' -a "
+ "\"$(" LS_BIN " -A '" EFIVARS_DIR
"')\"", SystemCmd::DoThrow);
+ options.verify = [](int exit_code) { return exit_code == 0 ||
exit_code == 1; };
+
+ SystemCmd cmd(options);
+
+ efibootmgr = cmd.retcode() == 0;
+
+ did_check = true;
+ }
+
+ return efibootmgr;
+ }
+
+
std::ostream&
operator<<(std::ostream& s, const Arch& arch)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/storage/SystemInfo/Arch.h
new/libstorage-ng-4.4.61/storage/SystemInfo/Arch.h
--- old/libstorage-ng-4.4.58/storage/SystemInfo/Arch.h 2021-11-23
14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/storage/SystemInfo/Arch.h 2021-12-01
12:38:48.000000000 +0100
@@ -58,6 +58,8 @@
bool is_efiboot() const { return efiboot; }
void set_efiboot(bool efiboot) { Arch::efiboot = efiboot; }
+ static bool is_efibootmgr();
+
unsigned int get_page_size() const { return page_size; }
friend std::ostream& operator<<(std::ostream& s, const Arch& arch);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/storage/Utils/AppUtil.cc
new/libstorage-ng-4.4.61/storage/Utils/AppUtil.cc
--- old/libstorage-ng-4.4.58/storage/Utils/AppUtil.cc 2021-11-23
14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/storage/Utils/AppUtil.cc 2021-12-01
12:38:48.000000000 +0100
@@ -425,24 +425,27 @@
/**
- * Breaks a device name like "/dev/sda2" into "/dev/sda" and 2
+ * Breaks a device name like "/dev/sda2" into "/dev/sda" and 2.
+ *
+ * Does in general not break partition names into disk name and number,
+ * e.g. "/dev/md0p1" breaks into "/dev/md0p" and "1".
*
* Throws an exception if the provided name does not contain the number
* part.
*/
- std::pair<string, unsigned int>
+ pair<string, unsigned int>
device_to_name_and_number(const string& full_name)
{
string::size_type pos = full_name.find_last_not_of("0123456789");
- if (pos == string::npos || pos == full_name.size() - 1)
- ST_THROW(Exception("device name has no number"));
+ if (pos == string::npos || pos == full_name.size() - 1)
+ ST_THROW(Exception("device name has no number"));
- return std::make_pair(full_name.substr(0, pos + 1),
atoi(full_name.substr(pos + 1).c_str()));
+ return make_pair(full_name.substr(0, pos + 1),
atoi(full_name.substr(pos + 1).c_str()));
}
/**
- * Inverse of device_to_name_and_number
+ * Inverse of device_to_name_and_number.
*/
string
name_and_number_to_device(const string& name, unsigned int number)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/storage/Utils/AppUtil.h
new/libstorage-ng-4.4.61/storage/Utils/AppUtil.h
--- old/libstorage-ng-4.4.58/storage/Utils/AppUtil.h 2021-11-23
14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/storage/Utils/AppUtil.h 2021-12-01
12:38:48.000000000 +0100
@@ -60,7 +60,7 @@
string make_dev_block_name(dev_t majorminor);
- std::pair<string, unsigned int> device_to_name_and_number(const string&
full_name);
+ pair<string, unsigned int> device_to_name_and_number(const string&
full_name);
string name_and_number_to_device(const string& name, unsigned int number);
vector<string> glob(const string& path, int flags);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/testsuite/probe/Makefile.am
new/libstorage-ng-4.4.61/testsuite/probe/Makefile.am
--- old/libstorage-ng-4.4.58/testsuite/probe/Makefile.am 2021-11-23
14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/testsuite/probe/Makefile.am 2021-12-01
12:38:48.000000000 +0100
@@ -20,8 +20,8 @@
btrfs4.test btrfs5.test tmpfs1.test
\
dasd1.test dasd2.test dasd3.test external-journal.test
\
dmraid1.test md-imsm1.test md-ddf1.test nfs1.test ntfs1.test xen1.test
\
- ambiguous1.test md+lvm1.test plain-encryption1.test missing1.test
\
- error1.test prefixed.test
+ ambiguous1.test ambiguous2.test md+lvm1.test plain-encryption1.test
\
+ missing1.test error1.test prefixed.test
AM_DEFAULT_SOURCE_EXT = .cc
@@ -73,6 +73,7 @@
ntfs1-mockup.xml ntfs1-devicegraph.xml
\
external-journal-mockup.xml external-journal-devicegraph.xml
\
ambiguous1-mockup.xml ambiguous1-devicegraph.xml
\
+ ambiguous2-mockup.xml ambiguous2-devicegraph.xml
\
md+lvm1-mockup.xml md+lvm1-devicegraph.xml
\
prefixed-mockup.xml prefixed-devicegraph.xml
\
missing1-mockup.xml
\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.58/testsuite/probe/ambiguous1-devicegraph.xml
new/libstorage-ng-4.4.61/testsuite/probe/ambiguous1-devicegraph.xml
--- old/libstorage-ng-4.4.58/testsuite/probe/ambiguous1-devicegraph.xml
2021-11-23 14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/testsuite/probe/ambiguous1-devicegraph.xml
2021-12-01 12:38:48.000000000 +0100
@@ -1,34 +1,49 @@
<?xml version="1.0"?>
-<!-- generated by libstorage-ng version 4.1.58, kassandra.suse.de, 2019-01-31
09:59:23 GMT -->
+<!-- generated by libstorage-ng version 4.4.59, kassandra.suse.de, 2021-12-01
08:25:12 GMT -->
<Devicegraph>
<Devices>
<Disk>
<sid>42</sid>
- <name>/dev/sda</name>
- <sysfs-name>sda</sysfs-name>
-
<sysfs-path>/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda</sysfs-path>
+ <name>/dev/sdc</name>
+ <sysfs-name>sdc</sysfs-name>
+
<sysfs-path>/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc</sysfs-path>
<region>
- <length>33554432</length>
+ <length>625142448</length>
<block-size>512</block-size>
</region>
- <udev-path>pci-0000:00:1f.2-ata-1</udev-path>
- <udev-id>ata-VBOX_HARDDISK_VB4fc3dfc5-aa799b6b</udev-id>
- <udev-id>scsi-0ATA_VBOX_HARDDISK_VB4fc3dfc5-aa799b6b</udev-id>
- <udev-id>scsi-1ATA_VBOX_HARDDISK_VB4fc3dfc5-aa799b6b</udev-id>
- <udev-id>scsi-SATA_VBOX_HARDDISK_VB4fc3dfc5-aa799b6b</udev-id>
- <topology/>
+ <udev-path>pci-0000:00:17.0-ata-3</udev-path>
+ <udev-path>pci-0000:00:17.0-ata-3.0</udev-path>
+ <udev-id>ata-TOSHIBA_MK3261GSYN_Y169P5D6T</udev-id>
+ <udev-id>scsi-0ATA_TOSHIBA_MK3261GS_Y169P5D6T</udev-id>
+ <udev-id>scsi-1ATA_TOSHIBA_MK3261GSYN_Y169P5D6T</udev-id>
+ <udev-id>scsi-350000393a258296e</udev-id>
+ <udev-id>scsi-SATA_TOSHIBA_MK3261GS_Y169P5D6T</udev-id>
+ <udev-id>wwn-0x50000393a258296e</udev-id>
<range>256</range>
<rotational>true</rotational>
<transport>SATA</transport>
</Disk>
- <Msdos>
+ <Btrfs>
<sid>43</sid>
- </Msdos>
+ <uuid>d090269c-1a57-4bd3-a182-5a300b818a72</uuid>
+ <metadata-raid-level>DUP</metadata-raid-level>
+ <data-raid-level>SINGLE</data-raid-level>
+ </Btrfs>
+ <BtrfsSubvolume>
+ <sid>44</sid>
+ <id>5</id>
+ <path></path>
+ <default-btrfs-subvolume>true</default-btrfs-subvolume>
+ </BtrfsSubvolume>
</Devices>
<Holders>
- <User>
+ <Subdevice>
+ <source-sid>43</source-sid>
+ <target-sid>44</target-sid>
+ </Subdevice>
+ <FilesystemUser>
<source-sid>42</source-sid>
<target-sid>43</target-sid>
- </User>
+ </FilesystemUser>
</Holders>
</Devicegraph>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.58/testsuite/probe/ambiguous1-mockup.xml
new/libstorage-ng-4.4.61/testsuite/probe/ambiguous1-mockup.xml
--- old/libstorage-ng-4.4.58/testsuite/probe/ambiguous1-mockup.xml
2021-11-23 14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/testsuite/probe/ambiguous1-mockup.xml
2021-12-01 12:38:48.000000000 +0100
@@ -1,276 +1,247 @@
<?xml version="1.0"?>
-<!-- generated by libstorage-ng version 4.1.58, kassandra.suse.de, 2019-01-31
09:59:23 GMT -->
+<!-- generated by libstorage-ng version 4.4.59, kassandra.suse.de, 2021-12-01
08:12:52 GMT -->
<Mockup>
<Commands>
<Command>
<name>/bin/ls -1 --sort=none '/sys/block'</name>
- <stdout>loop1</stdout>
- <stdout>loop6</stdout>
- <stdout>loop4</stdout>
- <stdout>sr0</stdout>
- <stdout>loop2</stdout>
- <stdout>loop0</stdout>
- <stdout>sda</stdout>
- <stdout>loop7</stdout>
- <stdout>loop5</stdout>
- <stdout>loop3</stdout>
+ <stdout>sdc</stdout>
</Command>
<Command>
<name>/sbin/blkid -c '/dev/null'</name>
- <stdout>/dev/loop0: TYPE="squashfs"</stdout>
- <stdout>/dev/loop1: TYPE="squashfs"</stdout>
- <stdout>/dev/loop2: TYPE="squashfs"</stdout>
- <stdout>/dev/loop3: TYPE="squashfs"</stdout>
- <stdout>/dev/loop4: TYPE="squashfs"</stdout>
- <stdout>/dev/loop5: TYPE="squashfs"</stdout>
- <stdout>/dev/loop6: TYPE="squashfs"</stdout>
- <stdout>/dev/sr0: UUID="2018-12-14-23-46-34-16"
LABEL="SLE-15-SP1-Installer-DVD-x86.001" TYPE="iso9660" PTUUID="46e82182"
PTTYPE="dos"</stdout>
- <stdout>/dev/sda: UUID="1e7f6c7f-2111-4586-9a30-76e6a7dfdd92"
UUID_SUB="f0461bbb-feb3-4158-8038-7e55cd1b2d37" TYPE="btrfs" PTUUID="b2ef1c94"
PTTYPE="dos"</stdout>
+ <stdout>/dev/sdc: UUID="d090269c-1a57-4bd3-a182-5a300b818a72"
UUID_SUB="ac4735ad-3176-4f88-a9d8-7744f9c56548" BLOCK_SIZE="4096" TYPE="btrfs"
PTUUID="401f8ba4" PTTYPE="dos"</stdout>
+ </Command>
+ <Command>
+ <name>/sbin/btrfs filesystem df (device:/dev/sdc)</name>
+ <stdout>Data, single: total=8.00MiB, used=0.00B</stdout>
+ <stdout>System, DUP: total=8.00MiB, used=16.00KiB</stdout>
+ <stdout>Metadata, DUP: total=1.00GiB, used=176.00KiB</stdout>
+ <stdout>GlobalReserve, single: total=3.25MiB, used=0.00B</stdout>
+ </Command>
+ <Command>
+ <name>/sbin/btrfs qgroup show -repc --raw (device:/dev/sdc)</name>
+ <stderr>ERROR: can't list qgroups: quotas not enabled</stderr>
+ <exit-code>1</exit-code>
+ </Command>
+ <Command>
+ <name>/sbin/btrfs subvolume list -a -puq (device:/dev/sdc)</name>
+ </Command>
+ <Command>
+ <name>/sbin/btrfs subvolume show (device:/dev/sdc)</name>
+ <stdout>/</stdout>
+ <stdout> Name: <FS_TREE></stdout>
+ <stdout> UUID:
7988fda9-cb00-4c9f-baad-c251c9e3cd6b</stdout>
+ <stdout> Parent UUID: -</stdout>
+ <stdout> Received UUID: -</stdout>
+ <stdout> Creation time: 2021-12-01 09:11:49 +0100</stdout>
+ <stdout> Subvolume ID: 5</stdout>
+ <stdout> Generation: 5</stdout>
+ <stdout> Gen at creation: 0</stdout>
+ <stdout> Parent ID: 0</stdout>
+ <stdout> Top level ID: 0</stdout>
+ <stdout> Flags: -</stdout>
+ <stdout> Send transid: 0</stdout>
+ <stdout> Send time: 2021-12-01 09:11:49 +0100</stdout>
+ <stdout> Receive transid: 0</stdout>
+ <stdout> Receive time: -</stdout>
+ <stdout> Snapshot(s):</stdout>
</Command>
<Command>
<name>/sbin/dmraid --sets=active -ccc</name>
- <stderr>bash: /sbin/dmraid: No such file or directory</stderr>
- <exit-code>127</exit-code>
+ <stdout>no raid disks</stdout>
+ <exit-code>1</exit-code>
</Command>
<Command>
- <!-- output faked and incomplete -->
<name>/sbin/dmsetup table</name>
</Command>
<Command>
<name>/sbin/multipath -d -v 2 -ll</name>
</Command>
<Command>
- <name>/usr/bin/udevadm info '/dev/sda'</name>
- <stdout>P:
/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda</stdout>
- <stdout>N: sda</stdout>
- <stdout>S: disk/by-id/ata-VBOX_HARDDISK_VB4fc3dfc5-aa799b6b</stdout>
- <stdout>S:
disk/by-id/scsi-0ATA_VBOX_HARDDISK_VB4fc3dfc5-aa799b6b</stdout>
- <stdout>S:
disk/by-id/scsi-1ATA_VBOX_HARDDISK_VB4fc3dfc5-aa799b6b</stdout>
- <stdout>S:
disk/by-id/scsi-SATA_VBOX_HARDDISK_VB4fc3dfc5-aa799b6b</stdout>
- <stdout>S: disk/by-path/pci-0000:00:1f.2-ata-1</stdout>
- <stdout>S: disk/by-uuid/1e7f6c7f-2111-4586-9a30-76e6a7dfdd92</stdout>
- <stdout>E: COMPAT_SYMLINK_GENERATION=2</stdout>
- <stdout>E:
DEVLINKS=/dev/disk/by-uuid/1e7f6c7f-2111-4586-9a30-76e6a7dfdd92
/dev/disk/by-id/scsi-0ATA_VBOX_HARDDISK_VB4fc3dfc5-aa799b6b
/dev/disk/by-id/scsi-1ATA_VBOX_HARDDISK_VB4fc3dfc5-aa799b6b
/dev/disk/by-id/ata-VBOX_HARDDISK_VB4fc3dfc5-aa799b6b
/dev/disk/by-id/scsi-SATA_VBOX_HARDDISK_VB4fc3dfc5-aa799b6b
/dev/disk/by-path/pci-0000:00:1f.2-ata-1</stdout>
- <stdout>E: DEVNAME=/dev/sda</stdout>
- <stdout>E:
DEVPATH=/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda</stdout>
+ <name>/usr/bin/getconf PAGESIZE</name>
+ <stdout>4096</stdout>
+ </Command>
+ <Command>
+ <name>/usr/bin/lsscsi --transport</name>
+ <stdout>[2:0:0:0] disk sata:50000393a258296e /dev/sdc
</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/efivars'</name>
+ <exit-code>1</exit-code>
+ </Command>
+ <Command>
+ <name>/usr/bin/udevadm info '/dev/sdc'</name>
+ <stdout>P:
/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc</stdout>
+ <stdout>N: sdc</stdout>
+ <stdout>L: 0</stdout>
+ <stdout>S: disk/by-path/pci-0000:00:17.0-ata-3.0</stdout>
+ <stdout>S: disk/by-uuid/d090269c-1a57-4bd3-a182-5a300b818a72</stdout>
+ <stdout>S: disk/by-id/scsi-SATA_TOSHIBA_MK3261GS_Y169P5D6T</stdout>
+ <stdout>S: disk/by-id/scsi-1ATA_TOSHIBA_MK3261GSYN_Y169P5D6T</stdout>
+ <stdout>S: disk/by-path/pci-0000:00:17.0-ata-3</stdout>
+ <stdout>S: disk/by-id/wwn-0x50000393a258296e</stdout>
+ <stdout>S: disk/by-id/scsi-350000393a258296e</stdout>
+ <stdout>S: disk/by-id/ata-TOSHIBA_MK3261GSYN_Y169P5D6T</stdout>
+ <stdout>S: disk/by-id/scsi-0ATA_TOSHIBA_MK3261GS_Y169P5D6T</stdout>
+ <stdout>E:
DEVPATH=/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc</stdout>
+ <stdout>E: DEVNAME=/dev/sdc</stdout>
<stdout>E: DEVTYPE=disk</stdout>
+ <stdout>E: DISKSEQ=3</stdout>
+ <stdout>E: MAJOR=8</stdout>
+ <stdout>E: MINOR=32</stdout>
+ <stdout>E: SUBSYSTEM=block</stdout>
+ <stdout>E: USEC_INITIALIZED=5446833</stdout>
<stdout>E: DONT_DEL_PART_NODES=1</stdout>
<stdout>E: ID_ATA=1</stdout>
+ <stdout>E: ID_TYPE=disk</stdout>
+ <stdout>E: ID_BUS=ata</stdout>
+ <stdout>E: ID_MODEL=TOSHIBA_MK3261GSYN</stdout>
+ <stdout>E:
ID_MODEL_ENC=TOSHIBA\x20MK3261GSYN\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20</stdout>
+ <stdout>E: ID_REVISION=MH000C</stdout>
+ <stdout>E: ID_SERIAL=TOSHIBA_MK3261GSYN_Y169P5D6T</stdout>
+ <stdout>E: ID_SERIAL_SHORT=Y169P5D6T</stdout>
+ <stdout>E: ID_ATA_WRITE_CACHE=1</stdout>
+ <stdout>E: ID_ATA_WRITE_CACHE_ENABLED=1</stdout>
<stdout>E: ID_ATA_FEATURE_SET_PM=1</stdout>
<stdout>E: ID_ATA_FEATURE_SET_PM_ENABLED=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_SECURITY=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_SECURITY_ENABLED=0</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_SECURITY_ERASE_UNIT_MIN=62</stdout>
+ <stdout>E:
ID_ATA_FEATURE_SET_SECURITY_ENHANCED_ERASE_UNIT_MIN=62</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_SECURITY_FROZEN=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_SMART=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_SMART_ENABLED=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_APM=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_APM_ENABLED=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_APM_CURRENT_VALUE=128</stdout>
+ <stdout>E: ID_ATA_DOWNLOAD_MICROCODE=1</stdout>
<stdout>E: ID_ATA_SATA=1</stdout>
<stdout>E: ID_ATA_SATA_SIGNAL_RATE_GEN2=1</stdout>
- <stdout>E: ID_ATA_WRITE_CACHE=1</stdout>
- <stdout>E: ID_ATA_WRITE_CACHE_ENABLED=1</stdout>
- <stdout>E: ID_BUS=ata</stdout>
- <stdout>E: ID_FS_TYPE=btrfs</stdout>
- <stdout>E: ID_FS_USAGE=filesystem</stdout>
- <stdout>E: ID_FS_UUID=1e7f6c7f-2111-4586-9a30-76e6a7dfdd92</stdout>
- <stdout>E: ID_FS_UUID_ENC=1e7f6c7f-2111-4586-9a30-76e6a7dfdd92</stdout>
- <stdout>E: ID_FS_UUID_SUB=f0461bbb-feb3-4158-8038-7e55cd1b2d37</stdout>
- <stdout>E:
ID_FS_UUID_SUB_ENC=f0461bbb-feb3-4158-8038-7e55cd1b2d37</stdout>
- <stdout>E: ID_MODEL=VBOX_HARDDISK</stdout>
- <stdout>E:
ID_MODEL_ENC=VBOX\x20HARDDISK\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20</stdout>
- <stdout>E: ID_PART_TABLE_TYPE=dos</stdout>
- <stdout>E: ID_PART_TABLE_UUID=b2ef1c94</stdout>
- <stdout>E: ID_PATH=pci-0000:00:1f.2-ata-1</stdout>
- <stdout>E: ID_PATH_TAG=pci-0000_00_1f_2-ata-1</stdout>
- <stdout>E: ID_REVISION=1.0</stdout>
+ <stdout>E: ID_ATA_SATA_SIGNAL_RATE_GEN1=1</stdout>
+ <stdout>E: ID_ATA_ROTATION_RATE_RPM=7200</stdout>
+ <stdout>E: ID_WWN=0x50000393a258296e</stdout>
+ <stdout>E: ID_WWN_WITH_EXTENSION=0x50000393a258296e</stdout>
+ <stdout>E: ID_PATH=pci-0000:00:17.0-ata-3.0</stdout>
+ <stdout>E: ID_PATH_TAG=pci-0000_00_17_0-ata-3_0</stdout>
+ <stdout>E: ID_PATH_ATA_COMPAT=pci-0000:00:17.0-ata-3</stdout>
+ <stdout>E: SCSI_TPGS=0</stdout>
+ <stdout>E: SCSI_TYPE=disk</stdout>
+ <stdout>E: SCSI_VENDOR=ATA</stdout>
+ <stdout>E: SCSI_VENDOR_ENC=ATA\x20\x20\x20\x20\x20</stdout>
+ <stdout>E: SCSI_MODEL=TOSHIBA_MK3261GS</stdout>
+ <stdout>E: SCSI_MODEL_ENC=TOSHIBA\x20MK3261GS</stdout>
+ <stdout>E: SCSI_REVISION=0C</stdout>
<stdout>E: ID_SCSI=1</stdout>
<stdout>E: ID_SCSI_INQUIRY=1</stdout>
- <stdout>E: ID_SERIAL=VBOX_HARDDISK_VB4fc3dfc5-aa799b6b</stdout>
- <stdout>E: ID_SERIAL_SHORT=VB4fc3dfc5-aa799b6b</stdout>
- <stdout>E: ID_TYPE=disk</stdout>
+ <stdout>E: SCSI_IDENT_SERIAL=Y169P5D6T</stdout>
+ <stdout>E: SCSI_IDENT_LUN_VENDOR=Y169P5D6T</stdout>
+ <stdout>E: SCSI_IDENT_LUN_T10=ATA_TOSHIBA_MK3261GSYN_Y169P5D6T</stdout>
+ <stdout>E: SCSI_IDENT_LUN_ATA=TOSHIBA_MK3261GSYN_Y169P5D6T</stdout>
+ <stdout>E: SCSI_IDENT_LUN_NAA_REG=50000393a258296e</stdout>
<stdout>E: ID_VENDOR=ATA</stdout>
<stdout>E: ID_VENDOR_ENC=ATA\x20\x20\x20\x20\x20</stdout>
- <stdout>E: MAJOR=8</stdout>
- <stdout>E: MINOR=0</stdout>
+ <stdout>E: ID_SCSI_SERIAL=Y169P5D6T</stdout>
<stdout>E: MPATH_SBIN_PATH=/sbin</stdout>
- <stdout>E: SCSI_IDENT_LUN_ATA=VBOX_HARDDISK_VB4fc3dfc5-aa799b6b</stdout>
- <stdout>E:
SCSI_IDENT_LUN_T10=ATA_VBOX_HARDDISK_VB4fc3dfc5-aa799b6b</stdout>
- <stdout>E: SCSI_IDENT_LUN_VENDOR=VB4fc3dfc5-aa799b6b</stdout>
- <stdout>E: SCSI_IDENT_SERIAL=VB4fc3dfc5-aa799b6b</stdout>
- <stdout>E: SCSI_MODEL=VBOX_HARDDISK</stdout>
- <stdout>E: SCSI_MODEL_ENC=VBOX\x20HARDDISK\x20\x20\x20</stdout>
- <stdout>E: SCSI_REVISION=1.0</stdout>
- <stdout>E: SCSI_TPGS=0</stdout>
- <stdout>E: SCSI_TYPE=disk</stdout>
- <stdout>E: SCSI_VENDOR=ATA</stdout>
- <stdout>E: SCSI_VENDOR_ENC=ATA\x20\x20\x20\x20\x20</stdout>
- <stdout>E: SUBSYSTEM=block</stdout>
- <stdout>E: TAGS=:systemd:</stdout>
- <stdout>E: USEC_INITIALIZED=2865031</stdout>
- </Command>
- <Command>
- <name>/usr/bin/udevadm info '/dev/sr0'</name>
- <stdout>P:
/devices/pci0000:00/0000:00:1f.1/ata4/host3/target3:0:0/3:0:0:0/block/sr0</stdout>
- <stdout>N: sr0</stdout>
- <stdout>L: -100</stdout>
- <stdout>S: cdrom</stdout>
- <stdout>S: disk/by-id/ata-VBOX_CD-ROM_VB2-01700376</stdout>
- <stdout>S: disk/by-label/SLE-15-SP1-Installer-DVD-x86.001</stdout>
- <stdout>S: disk/by-path/pci-0000:00:1f.1-ata-2</stdout>
- <stdout>S: disk/by-uuid/2018-12-14-23-46-34-16</stdout>
- <stdout>S: dvd</stdout>
- <stdout>E: DEVLINKS=/dev/disk/by-path/pci-0000:00:1f.1-ata-2
/dev/disk/by-id/ata-VBOX_CD-ROM_VB2-01700376
/dev/disk/by-uuid/2018-12-14-23-46-34-16 /dev/cdrom /dev/dvd
/dev/disk/by-label/SLE-15-SP1-Installer-DVD-x86.001</stdout>
- <stdout>E: DEVNAME=/dev/sr0</stdout>
- <stdout>E:
DEVPATH=/devices/pci0000:00/0000:00:1f.1/ata4/host3/target3:0:0/3:0:0:0/block/sr0</stdout>
- <stdout>E: DEVTYPE=disk</stdout>
- <stdout>E: ID_ATA=1</stdout>
- <stdout>E: ID_BUS=ata</stdout>
- <stdout>E: ID_CDROM=1</stdout>
- <stdout>E: ID_CDROM_DVD=1</stdout>
- <stdout>E: ID_CDROM_MEDIA=1</stdout>
- <stdout>E: ID_CDROM_MEDIA_CD=1</stdout>
- <stdout>E: ID_CDROM_MEDIA_SESSION_COUNT=1</stdout>
- <stdout>E: ID_CDROM_MEDIA_TRACK_COUNT=1</stdout>
- <stdout>E: ID_CDROM_MEDIA_TRACK_COUNT_DATA=1</stdout>
- <stdout>E: ID_CDROM_MRW=1</stdout>
- <stdout>E: ID_CDROM_MRW_W=1</stdout>
- <stdout>E:
ID_FS_APPLICATION_ID=SLE-15-SP1-Installer-DVD-x86_64-Build126.1-Media1</stdout>
- <stdout>E: ID_FS_BOOT_SYSTEM_ID=EL\x20TORITO\x20SPECIFICATION</stdout>
- <stdout>E: ID_FS_LABEL=SLE-15-SP1-Installer-DVD-x86.001</stdout>
- <stdout>E: ID_FS_LABEL_ENC=SLE-15-SP1-Installer-DVD-x86.001</stdout>
- <stdout>E: ID_FS_PUBLISHER_ID=SUSE\x20LINUX\x20GmbH</stdout>
- <stdout>E: ID_FS_SYSTEM_ID=LINUX</stdout>
- <stdout>E: ID_FS_TYPE=iso9660</stdout>
+ <stdout>E: DM_MULTIPATH_DEVICE_PATH=0</stdout>
+ <stdout>E: ID_FS_UUID=d090269c-1a57-4bd3-a182-5a300b818a72</stdout>
+ <stdout>E: ID_FS_UUID_ENC=d090269c-1a57-4bd3-a182-5a300b818a72</stdout>
+ <stdout>E: ID_FS_UUID_SUB=ac4735ad-3176-4f88-a9d8-7744f9c56548</stdout>
+ <stdout>E:
ID_FS_UUID_SUB_ENC=ac4735ad-3176-4f88-a9d8-7744f9c56548</stdout>
+ <stdout>E: ID_FS_TYPE=btrfs</stdout>
<stdout>E: ID_FS_USAGE=filesystem</stdout>
- <stdout>E: ID_FS_UUID=2018-12-14-23-46-34-16</stdout>
- <stdout>E: ID_FS_UUID_ENC=2018-12-14-23-46-34-16</stdout>
- <stdout>E: ID_FS_VERSION=Joliet Extension</stdout>
- <stdout>E: ID_MODEL=VBOX_CD-ROM</stdout>
- <stdout>E:
ID_MODEL_ENC=VBOX\x20CD-ROM\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20</stdout>
+ <stdout>E: ID_PART_TABLE_UUID=401f8ba4</stdout>
<stdout>E: ID_PART_TABLE_TYPE=dos</stdout>
- <stdout>E: ID_PART_TABLE_UUID=46e82182</stdout>
- <stdout>E: ID_PATH=pci-0000:00:1f.1-ata-2</stdout>
- <stdout>E: ID_PATH_TAG=pci-0000_00_1f_1-ata-2</stdout>
- <stdout>E: ID_REVISION=1.0</stdout>
- <stdout>E: ID_SCSI=1</stdout>
- <stdout>E: ID_SCSI_INQUIRY=1</stdout>
- <stdout>E: ID_SERIAL=VBOX_CD-ROM_VB2-01700376</stdout>
- <stdout>E: ID_SERIAL_SHORT=VB2-01700376</stdout>
- <stdout>E: ID_TYPE=cd</stdout>
- <stdout>E: ID_VENDOR=VBOX</stdout>
- <stdout>E: ID_VENDOR_ENC=VBOX\x20\x20\x20\x20</stdout>
- <stdout>E: MAJOR=11</stdout>
- <stdout>E: MINOR=0</stdout>
- <stdout>E: SCSI_MODEL=CD-ROM</stdout>
- <stdout>E:
SCSI_MODEL_ENC=CD-ROM\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20</stdout>
- <stdout>E: SCSI_REVISION=1.0</stdout>
- <stdout>E: SCSI_TPGS=0</stdout>
- <stdout>E: SCSI_TYPE=cd/dvd</stdout>
- <stdout>E: SCSI_VENDOR=VBOX</stdout>
- <stdout>E: SCSI_VENDOR_ENC=VBOX\x20\x20\x20\x20</stdout>
- <stdout>E: SUBSYSTEM=block</stdout>
- <stdout>E: SYSTEMD_MOUNT_DEVICE_BOUND=1</stdout>
+ <stdout>E: COMPAT_SYMLINK_GENERATION=2</stdout>
+ <stdout>E: ID_BTRFS_READY=1</stdout>
+ <stdout>E: DEVLINKS=/dev/disk/by-path/pci-0000:00:17.0-ata-3.0
/dev/disk/by-uuid/d090269c-1a57-4bd3-a182-5a300b818a72
/dev/disk/by-id/scsi-SATA_TOSHIBA_MK3261GS_Y169P5D6T
/dev/disk/by-id/scsi-1ATA_TOSHIBA_MK3261GSYN_Y169P5D6T
/dev/disk/by-path/pci-0000:00:17.0-ata-3 /dev/disk/by-id/wwn-0x50000393a258296e
/dev/disk/by-id/scsi-350000393a258296e
/dev/disk/by-id/ata-TOSHIBA_MK3261GSYN_Y169P5D6T
/dev/disk/by-id/scsi-0ATA_TOSHIBA_MK3261GS_Y169P5D6T</stdout>
<stdout>E: TAGS=:systemd:</stdout>
- <stdout>E: USEC_INITIALIZED=2854940</stdout>
+ <stdout>E: CURRENT_TAGS=:systemd:</stdout>
+ <stdout></stdout>
</Command>
<Command>
<name>/usr/bin/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>[0:0:0:0] disk sata: /dev/sda
</stdout>
- <stdout>[3:0:0:0] cd/dvd ata:
/dev/sr0</stdout>
- </Command>
- <Command>
- <name>/usr/bin/stat --format '%f' '/dev/sda'</name>
- <stdout>61b0</stdout>
- </Command>
- <Command>
- <name>/usr/bin/stat --format '%f' '/dev/sr0'</name>
- <stdout>61b0</stdout>
- </Command>
- <Command>
- <name>/usr/bin/test -d '/sys/firmware/efi/efivars'</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/sda' unit s print</name>
+ <name>/usr/sbin/parted --script --machine '/dev/sdc' unit s print</name>
<stdout>BYT;</stdout>
- <stdout>/dev/sda:33554432s:scsi:512:512:msdos:ATA VBOX
HARDDISK:;</stdout>
+ <stdout>/dev/sdc:625142448s:scsi:512:512:msdos:ATA TOSHIBA
MK3261GS::4;</stdout>
</Command>
</Commands>
<Files>
<File>
- <name>/etc/fstab</name>
- <content>proc /proc proc defaults 0 0</content>
- <content>sysfs /sys sysfs noauto 0 0</content>
- <content>usbfs /proc/bus/usb usbfs noauto 0 0</content>
+ <name>/etc/crypttab</name>
</File>
<File>
- <name>/etc/crypttab</name>
+ <name>/etc/fstab</name>
</File>
<File>
<name>/proc/mounts</name>
- <content>tmpfs / tmpfs rw,relatime,size=2032748k,nr_inodes=0 0
0</content>
- <content>tmpfs / tmpfs rw,relatime,size=2032748k,nr_inodes=0 0
0</content>
- <content>proc /proc proc rw,relatime 0 0</content>
- <content>sysfs /sys sysfs rw,relatime 0 0</content>
- <content>/dev/loop0 /parts/mp_0000 squashfs ro,relatime 0 0</content>
- <content>/dev/loop1 /parts/mp_0001 squashfs ro,relatime 0 0</content>
- <content>devtmpfs /dev devtmpfs
rw,relatime,size=975688k,nr_inodes=243922,mode=755 0 0</content>
- <content>devpts /dev/pts devpts rw,relatime,mode=600,ptmxmode=000 0
0</content>
- <content>rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0
0</content>
- <content>/dev/disk/by-id/ata-VBOX_CD-ROM_VB2-01700376 /var/adm/mount
iso9660 ro,relatime 0 0</content>
- <content>/dev/loop2 /mounts/mp_0000 squashfs ro,relatime 0 0</content>
- <content>/dev/loop3 /mounts/mp_0001 squashfs ro,relatime 0 0</content>
- <content>/dev/loop4 /mounts/mp_0002 squashfs ro,relatime 0 0</content>
- <content>/dev/loop5 /mounts/mp_0003 squashfs ro,relatime 0 0</content>
- <content>/dev/loop6 /mounts/mp_0004 squashfs ro,relatime 0 0</content>
+ <content>proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0</content>
+ <content>sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0</content>
+ <content>devtmpfs /dev devtmpfs
rw,nosuid,size=16254664k,nr_inodes=4063666,mode=755,inode64 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,inode64 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,size=6507684k,nr_inodes=819200,mode=755,inode64 0 0</content>
+ <content>cgroup2 /sys/fs/cgroup cgroup2
rw,nosuid,nodev,noexec,relatime,nsdelegate,memory_recursiveprot 0 0</content>
+ <content>pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0
0</content>
+ <content>none /sys/fs/bpf bpf rw,nosuid,nodev,noexec,relatime,mode=700 0
0</content>
+ <content>systemd-1 /proc/sys/fs/binfmt_misc autofs
rw,relatime,fd=30,pgrp=1,timeout=0,minproto=5,maxproto=5,direct,pipe_ino=19639
0 0</content>
+ <content>tracefs /sys/kernel/tracing tracefs
rw,nosuid,nodev,noexec,relatime 0 0</content>
+ <content>hugetlbfs /dev/hugepages hugetlbfs rw,relatime,pagesize=2M 0
0</content>
+ <content>debugfs /sys/kernel/debug debugfs
rw,nosuid,nodev,noexec,relatime 0 0</content>
+ <content>mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec,relatime 0
0</content>
+ <content>fusectl /sys/fs/fuse/connections fusectl
rw,nosuid,nodev,noexec,relatime 0 0</content>
+ <content>configfs /sys/kernel/config configfs
rw,nosuid,nodev,noexec,relatime 0 0</content>
+ <content>tmpfs /tmp tmpfs rw,nosuid,nodev,nr_inodes=409600,inode64 0
0</content>
+ <content>tmpfs /run/user/0 tmpfs
rw,nosuid,nodev,relatime,size=3253840k,nr_inodes=813460,mode=700,inode64 0
0</content>
</File>
<File>
<name>/proc/swaps</name>
- <content>Filename Type Size
Used Priority</content>
+ <content>Filename Type Size
Used Priority</content>
</File>
<File>
-
<name>/sys/devices/pci0000:00/0000:00:1f.1/ata4/host3/target3:0:0/3:0:0:0/block/sr0/ext_range</name>
- <content>1</content>
- </File>
- <File>
-
<name>/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/alignment_offset</name>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/alignment_offset</name>
<content>0</content>
</File>
<File>
-
<name>/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/ro</name>
- <content>0</content>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/ext_range</name>
+ <content>256</content>
</File>
<File>
-
<name>/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/ext_range</name>
- <content>256</content>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/queue/dax</name>
+ <content>0</content>
</File>
<File>
-
<name>/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/queue/logical_block_size</name>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/queue/logical_block_size</name>
<content>512</content>
</File>
<File>
-
<name>/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/queue/optimal_io_size</name>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/queue/optimal_io_size</name>
<content>0</content>
</File>
<File>
-
<name>/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/queue/rotational</name>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/queue/rotational</name>
<content>1</content>
</File>
<File>
-
<name>/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/queue/dax</name>
- <content>0</content>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/queue/zoned</name>
+ <content>none</content>
</File>
<File>
-
<name>/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/queue/zoned</name>
- <content>none</content>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/ro</name>
+ <content>0</content>
</File>
<File>
-
<name>/sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/size</name>
- <content>33554432</content>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/size</name>
+ <content>625142448</content>
</File>
</Files>
</Mockup>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/testsuite/probe/ambiguous1.cc
new/libstorage-ng-4.4.61/testsuite/probe/ambiguous1.cc
--- old/libstorage-ng-4.4.58/testsuite/probe/ambiguous1.cc 2021-11-23
14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/testsuite/probe/ambiguous1.cc 2021-12-01
12:38:48.000000000 +0100
@@ -32,11 +32,9 @@
Storage storage(environment);
storage.probe(&probe_callbacks_recorder);
- BOOST_REQUIRE_EQUAL(probe_messages.size(), 3);
+ BOOST_REQUIRE_EQUAL(probe_messages.size(), 2);
BOOST_CHECK_EQUAL(probe_messages[0], "begin:");
- BOOST_CHECK_EQUAL(probe_messages[1], "error: message = 'Detected a file
system next to a partition table on the\n"
- "device /dev/sda. The file system will be ignored.', what
= ''");
- BOOST_CHECK_EQUAL(probe_messages[2], "end:");
+ BOOST_CHECK_EQUAL(probe_messages[1], "end:");
const Devicegraph* probed = storage.get_probed();
probed->check();
@@ -49,5 +47,5 @@
BOOST_CHECK_MESSAGE(cmp.ok(), cmp);
BOOST_CHECK_EQUAL(required_features(probed), "");
- BOOST_CHECK_EQUAL(suggested_features(probed), "");
+ BOOST_CHECK_EQUAL(suggested_features(probed), "btrfs");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.58/testsuite/probe/ambiguous2-devicegraph.xml
new/libstorage-ng-4.4.61/testsuite/probe/ambiguous2-devicegraph.xml
--- old/libstorage-ng-4.4.58/testsuite/probe/ambiguous2-devicegraph.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/libstorage-ng-4.4.61/testsuite/probe/ambiguous2-devicegraph.xml
2021-12-01 12:38:48.000000000 +0100
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!-- generated by libstorage-ng version 4.4.59, kassandra.suse.de, 2021-12-01
09:12:46 GMT -->
+<Devicegraph>
+ <Devices>
+ <Disk>
+ <sid>42</sid>
+ <name>/dev/sdc</name>
+ <sysfs-name>sdc</sysfs-name>
+
<sysfs-path>/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc</sysfs-path>
+ <region>
+ <length>625142448</length>
+ <block-size>512</block-size>
+ </region>
+ <udev-path>pci-0000:00:17.0-ata-3</udev-path>
+ <udev-path>pci-0000:00:17.0-ata-3.0</udev-path>
+ <udev-id>ata-TOSHIBA_MK3261GSYN_Y169P5D6T</udev-id>
+ <udev-id>scsi-0ATA_TOSHIBA_MK3261GS_Y169P5D6T</udev-id>
+ <udev-id>scsi-1ATA_TOSHIBA_MK3261GSYN_Y169P5D6T</udev-id>
+ <udev-id>scsi-350000393a258296e</udev-id>
+ <udev-id>scsi-SATA_TOSHIBA_MK3261GS_Y169P5D6T</udev-id>
+ <udev-id>wwn-0x50000393a258296e</udev-id>
+ <range>256</range>
+ <rotational>true</rotational>
+ <transport>SATA</transport>
+ </Disk>
+ <Gpt>
+ <sid>43</sid>
+ </Gpt>
+ </Devices>
+ <Holders>
+ <User>
+ <source-sid>42</source-sid>
+ <target-sid>43</target-sid>
+ </User>
+ </Holders>
+</Devicegraph>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-ng-4.4.58/testsuite/probe/ambiguous2-mockup.xml
new/libstorage-ng-4.4.61/testsuite/probe/ambiguous2-mockup.xml
--- old/libstorage-ng-4.4.58/testsuite/probe/ambiguous2-mockup.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/libstorage-ng-4.4.61/testsuite/probe/ambiguous2-mockup.xml
2021-12-01 12:38:48.000000000 +0100
@@ -0,0 +1,212 @@
+<?xml version="1.0"?>
+<!-- generated by libstorage-ng version 4.4.59, kassandra.suse.de, 2021-12-01
08:27:13 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/sdc: UUID="d090269c-1a57-4bd3-a182-5a300b818a72"
UUID_SUB="ac4735ad-3176-4f88-a9d8-7744f9c56548" BLOCK_SIZE="4096" TYPE="btrfs"
PTUUID="e00c8073-6bd2-44e6-90d0-2e7c17185cde" PTTYPE="gpt"</stdout>
+ </Command>
+ <Command>
+ <name>/sbin/dmraid --sets=active -ccc</name>
+ <stdout>no raid disks</stdout>
+ <exit-code>1</exit-code>
+ </Command>
+ <Command>
+ <name>/sbin/dmsetup table</name>
+ </Command>
+ <Command>
+ <name>/sbin/multipath -d -v 2 -ll</name>
+ </Command>
+ <Command>
+ <name>/usr/bin/getconf PAGESIZE</name>
+ <stdout>4096</stdout>
+ </Command>
+ <Command>
+ <name>/usr/bin/lsscsi --transport</name>
+ <stdout>[2:0:0:0] disk sata:50000393a258296e /dev/sdc
</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/efivars'</name>
+ <exit-code>1</exit-code>
+ </Command>
+ <Command>
+ <name>/usr/bin/udevadm info '/dev/sdc'</name>
+ <stdout>P:
/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc</stdout>
+ <stdout>N: sdc</stdout>
+ <stdout>L: 0</stdout>
+ <stdout>S: disk/by-path/pci-0000:00:17.0-ata-3</stdout>
+ <stdout>S: disk/by-id/scsi-0ATA_TOSHIBA_MK3261GS_Y169P5D6T</stdout>
+ <stdout>S: disk/by-id/wwn-0x50000393a258296e</stdout>
+ <stdout>S: disk/by-id/scsi-350000393a258296e</stdout>
+ <stdout>S: disk/by-path/pci-0000:00:17.0-ata-3.0</stdout>
+ <stdout>S: disk/by-uuid/d090269c-1a57-4bd3-a182-5a300b818a72</stdout>
+ <stdout>S: disk/by-id/scsi-1ATA_TOSHIBA_MK3261GSYN_Y169P5D6T</stdout>
+ <stdout>S: disk/by-id/scsi-SATA_TOSHIBA_MK3261GS_Y169P5D6T</stdout>
+ <stdout>S: disk/by-id/ata-TOSHIBA_MK3261GSYN_Y169P5D6T</stdout>
+ <stdout>E:
DEVPATH=/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc</stdout>
+ <stdout>E: DEVNAME=/dev/sdc</stdout>
+ <stdout>E: DEVTYPE=disk</stdout>
+ <stdout>E: DISKSEQ=3</stdout>
+ <stdout>E: MAJOR=8</stdout>
+ <stdout>E: MINOR=32</stdout>
+ <stdout>E: SUBSYSTEM=block</stdout>
+ <stdout>E: USEC_INITIALIZED=5446833</stdout>
+ <stdout>E: DONT_DEL_PART_NODES=1</stdout>
+ <stdout>E: ID_ATA=1</stdout>
+ <stdout>E: ID_TYPE=disk</stdout>
+ <stdout>E: ID_BUS=ata</stdout>
+ <stdout>E: ID_MODEL=TOSHIBA_MK3261GSYN</stdout>
+ <stdout>E:
ID_MODEL_ENC=TOSHIBA\x20MK3261GSYN\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20</stdout>
+ <stdout>E: ID_REVISION=MH000C</stdout>
+ <stdout>E: ID_SERIAL=TOSHIBA_MK3261GSYN_Y169P5D6T</stdout>
+ <stdout>E: ID_SERIAL_SHORT=Y169P5D6T</stdout>
+ <stdout>E: ID_ATA_WRITE_CACHE=1</stdout>
+ <stdout>E: ID_ATA_WRITE_CACHE_ENABLED=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_PM=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_PM_ENABLED=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_SECURITY=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_SECURITY_ENABLED=0</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_SECURITY_ERASE_UNIT_MIN=62</stdout>
+ <stdout>E:
ID_ATA_FEATURE_SET_SECURITY_ENHANCED_ERASE_UNIT_MIN=62</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_SECURITY_FROZEN=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_SMART=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_SMART_ENABLED=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_APM=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_APM_ENABLED=1</stdout>
+ <stdout>E: ID_ATA_FEATURE_SET_APM_CURRENT_VALUE=128</stdout>
+ <stdout>E: ID_ATA_DOWNLOAD_MICROCODE=1</stdout>
+ <stdout>E: ID_ATA_SATA=1</stdout>
+ <stdout>E: ID_ATA_SATA_SIGNAL_RATE_GEN2=1</stdout>
+ <stdout>E: ID_ATA_SATA_SIGNAL_RATE_GEN1=1</stdout>
+ <stdout>E: ID_ATA_ROTATION_RATE_RPM=7200</stdout>
+ <stdout>E: ID_WWN=0x50000393a258296e</stdout>
+ <stdout>E: ID_WWN_WITH_EXTENSION=0x50000393a258296e</stdout>
+ <stdout>E: ID_PATH=pci-0000:00:17.0-ata-3.0</stdout>
+ <stdout>E: ID_PATH_TAG=pci-0000_00_17_0-ata-3_0</stdout>
+ <stdout>E: ID_PATH_ATA_COMPAT=pci-0000:00:17.0-ata-3</stdout>
+ <stdout>E: SCSI_TPGS=0</stdout>
+ <stdout>E: SCSI_TYPE=disk</stdout>
+ <stdout>E: SCSI_VENDOR=ATA</stdout>
+ <stdout>E: SCSI_VENDOR_ENC=ATA\x20\x20\x20\x20\x20</stdout>
+ <stdout>E: SCSI_MODEL=TOSHIBA_MK3261GS</stdout>
+ <stdout>E: SCSI_MODEL_ENC=TOSHIBA\x20MK3261GS</stdout>
+ <stdout>E: SCSI_REVISION=0C</stdout>
+ <stdout>E: ID_SCSI=1</stdout>
+ <stdout>E: ID_SCSI_INQUIRY=1</stdout>
+ <stdout>E: SCSI_IDENT_SERIAL=Y169P5D6T</stdout>
+ <stdout>E: SCSI_IDENT_LUN_VENDOR=Y169P5D6T</stdout>
+ <stdout>E: SCSI_IDENT_LUN_T10=ATA_TOSHIBA_MK3261GSYN_Y169P5D6T</stdout>
+ <stdout>E: SCSI_IDENT_LUN_ATA=TOSHIBA_MK3261GSYN_Y169P5D6T</stdout>
+ <stdout>E: SCSI_IDENT_LUN_NAA_REG=50000393a258296e</stdout>
+ <stdout>E: ID_VENDOR=ATA</stdout>
+ <stdout>E: ID_VENDOR_ENC=ATA\x20\x20\x20\x20\x20</stdout>
+ <stdout>E: ID_SCSI_SERIAL=Y169P5D6T</stdout>
+ <stdout>E: MPATH_SBIN_PATH=/sbin</stdout>
+ <stdout>E: DM_MULTIPATH_DEVICE_PATH=0</stdout>
+ <stdout>E: ID_FS_UUID=d090269c-1a57-4bd3-a182-5a300b818a72</stdout>
+ <stdout>E: ID_FS_UUID_ENC=d090269c-1a57-4bd3-a182-5a300b818a72</stdout>
+ <stdout>E: ID_FS_UUID_SUB=ac4735ad-3176-4f88-a9d8-7744f9c56548</stdout>
+ <stdout>E:
ID_FS_UUID_SUB_ENC=ac4735ad-3176-4f88-a9d8-7744f9c56548</stdout>
+ <stdout>E: ID_FS_TYPE=btrfs</stdout>
+ <stdout>E: ID_FS_USAGE=filesystem</stdout>
+ <stdout>E:
ID_PART_TABLE_UUID=e00c8073-6bd2-44e6-90d0-2e7c17185cde</stdout>
+ <stdout>E: ID_PART_TABLE_TYPE=gpt</stdout>
+ <stdout>E: COMPAT_SYMLINK_GENERATION=2</stdout>
+ <stdout>E: ID_BTRFS_READY=1</stdout>
+ <stdout>E: DEVLINKS=/dev/disk/by-path/pci-0000:00:17.0-ata-3
/dev/disk/by-id/scsi-0ATA_TOSHIBA_MK3261GS_Y169P5D6T
/dev/disk/by-id/wwn-0x50000393a258296e /dev/disk/by-id/scsi-350000393a258296e
/dev/disk/by-path/pci-0000:00:17.0-ata-3.0
/dev/disk/by-uuid/d090269c-1a57-4bd3-a182-5a300b818a72
/dev/disk/by-id/scsi-1ATA_TOSHIBA_MK3261GSYN_Y169P5D6T
/dev/disk/by-id/scsi-SATA_TOSHIBA_MK3261GS_Y169P5D6T
/dev/disk/by-id/ata-TOSHIBA_MK3261GSYN_Y169P5D6T</stdout>
+ <stdout>E: TAGS=:systemd:</stdout>
+ <stdout>E: CURRENT_TAGS=:systemd:</stdout>
+ <stdout></stdout>
+ </Command>
+ <Command>
+ <name>/usr/bin/udevadm settle --timeout=20</name>
+ </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:625142448s:scsi:512:512:gpt:ATA TOSHIBA
MK3261GS::128;</stdout>
+ </Command>
+ </Commands>
+ <Files>
+ <File>
+ <name>/etc/crypttab</name>
+ </File>
+ <File>
+ <name>/etc/fstab</name>
+ </File>
+ <File>
+ <name>/proc/mounts</name>
+ <content>proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0</content>
+ <content>sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0</content>
+ <content>devtmpfs /dev devtmpfs
rw,nosuid,size=16254664k,nr_inodes=4063666,mode=755,inode64 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,inode64 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,size=6507684k,nr_inodes=819200,mode=755,inode64 0 0</content>
+ <content>cgroup2 /sys/fs/cgroup cgroup2
rw,nosuid,nodev,noexec,relatime,nsdelegate,memory_recursiveprot 0 0</content>
+ <content>pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0
0</content>
+ <content>none /sys/fs/bpf bpf rw,nosuid,nodev,noexec,relatime,mode=700 0
0</content>
+ <content>systemd-1 /proc/sys/fs/binfmt_misc autofs
rw,relatime,fd=30,pgrp=1,timeout=0,minproto=5,maxproto=5,direct,pipe_ino=19639
0 0</content>
+ <content>tracefs /sys/kernel/tracing tracefs
rw,nosuid,nodev,noexec,relatime 0 0</content>
+ <content>hugetlbfs /dev/hugepages hugetlbfs rw,relatime,pagesize=2M 0
0</content>
+ <content>debugfs /sys/kernel/debug debugfs
rw,nosuid,nodev,noexec,relatime 0 0</content>
+ <content>mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec,relatime 0
0</content>
+ <content>fusectl /sys/fs/fuse/connections fusectl
rw,nosuid,nodev,noexec,relatime 0 0</content>
+ <content>configfs /sys/kernel/config configfs
rw,nosuid,nodev,noexec,relatime 0 0</content>
+ <content>tmpfs /tmp tmpfs rw,nosuid,nodev,nr_inodes=409600,inode64 0
0</content>
+ <content>tmpfs /run/user/0 tmpfs
rw,nosuid,nodev,relatime,size=3253840k,nr_inodes=813460,mode=700,inode64 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:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/alignment_offset</name>
+ <content>0</content>
+ </File>
+ <File>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/ext_range</name>
+ <content>256</content>
+ </File>
+ <File>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/queue/dax</name>
+ <content>0</content>
+ </File>
+ <File>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/queue/logical_block_size</name>
+ <content>512</content>
+ </File>
+ <File>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/queue/optimal_io_size</name>
+ <content>0</content>
+ </File>
+ <File>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/queue/rotational</name>
+ <content>1</content>
+ </File>
+ <File>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/queue/zoned</name>
+ <content>none</content>
+ </File>
+ <File>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/ro</name>
+ <content>0</content>
+ </File>
+ <File>
+
<name>/sys/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdc/size</name>
+ <content>625142448</content>
+ </File>
+ </Files>
+</Mockup>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/testsuite/probe/ambiguous2.cc
new/libstorage-ng-4.4.61/testsuite/probe/ambiguous2.cc
--- old/libstorage-ng-4.4.58/testsuite/probe/ambiguous2.cc 1970-01-01
01:00:00.000000000 +0100
+++ new/libstorage-ng-4.4.61/testsuite/probe/ambiguous2.cc 2021-12-01
12:38:48.000000000 +0100
@@ -0,0 +1,53 @@
+
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE libstorage
+
+#include <boost/test/unit_test.hpp>
+
+#include "storage/Environment.h"
+#include "storage/Storage.h"
+#include "storage/Devicegraph.h"
+#include "storage/UsedFeatures.h"
+
+#include "testsuite/helpers/TsCmp.h"
+#include "testsuite/helpers/CallbacksRecorder.h"
+
+
+using namespace std;
+using namespace storage;
+
+
+BOOST_AUTO_TEST_CASE(probe)
+{
+ setenv("LIBSTORAGE_MULTIPLE_DEVICES_BTRFS", "no", 1);
+
+ set_logger(get_stdout_logger());
+
+ Environment environment(true, ProbeMode::READ_MOCKUP, TargetMode::DIRECT);
+ environment.set_mockup_filename("ambiguous2-mockup.xml");
+
+ vector<string> probe_messages;
+ ProbeCallbacksRecorder probe_callbacks_recorder(probe_messages);
+
+ Storage storage(environment);
+ storage.probe(&probe_callbacks_recorder);
+
+ BOOST_REQUIRE_EQUAL(probe_messages.size(), 3);
+ BOOST_CHECK_EQUAL(probe_messages[0], "begin:");
+ BOOST_CHECK_EQUAL(probe_messages[1], "error: message = 'Detected a file
system next to a partition table on the\n"
+ "device /dev/sdc. The file system will be ignored.', what
= ''");
+ BOOST_CHECK_EQUAL(probe_messages[2], "end:");
+
+ const Devicegraph* probed = storage.get_probed();
+ probed->check();
+
+ Devicegraph* staging = storage.get_staging();
+ staging->load("ambiguous2-devicegraph.xml");
+ staging->check();
+
+ TsCmpDevicegraph cmp(*probed, *staging);
+ BOOST_CHECK_MESSAGE(cmp.ok(), cmp);
+
+ BOOST_CHECK_EQUAL(required_features(probed), "");
+ BOOST_CHECK_EQUAL(suggested_features(probed), "");
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-ng-4.4.58/testsuite/set-source.cc
new/libstorage-ng-4.4.61/testsuite/set-source.cc
--- old/libstorage-ng-4.4.58/testsuite/set-source.cc 2021-11-23
14:13:04.000000000 +0100
+++ new/libstorage-ng-4.4.61/testsuite/set-source.cc 2021-12-01
12:38:48.000000000 +0100
@@ -6,6 +6,7 @@
#include "storage/Utils/HumanString.h"
#include "storage/Devices/DiskImpl.h"
+#include "storage/Devices/Multipath.h"
#include "storage/Devices/Gpt.h"
#include "storage/Holders/Holder.h"
#include "storage/Devicegraph.h"
@@ -61,3 +62,32 @@
BOOST_CHECK_EQUAL(sda1->get_udev_ids().size(), 1);
BOOST_CHECK_EQUAL(sda1->get_udev_ids()[0],
"scsi-SATA_VBOX_HARDDISK_VB20a8f410-8a3f17dc-part1");
}
+
+
+BOOST_AUTO_TEST_CASE(test2)
+{
+ Environment environment(true, ProbeMode::NONE, TargetMode::DIRECT);
+
+ Storage storage(environment);
+
+ Devicegraph* staging = storage.get_staging();
+
+ Multipath* multipath1 = Multipath::create(staging, "/dev/mapper/mpatha");
+ multipath1->set_dm_table_name("dm-0");
+
+ Multipath* multipath2 = Multipath::create(staging, "/dev/mapper/mpathb");
+ multipath2->set_dm_table_name("dm-1");
+
+ Gpt* gpt = to_gpt(multipath1->create_partition_table(PtType::GPT));
+ Partition* partition = gpt->create_partition("/dev/mapper/mpatha-part2",
Region(2048, 1048576, 512), PartitionType::PRIMARY);
+ partition->set_dm_table_name("dm-2");
+
+ BOOST_CHECK_EQUAL(partition->get_name(), "/dev/mapper/mpatha-part2");
+ BOOST_CHECK_EQUAL(partition->get_dm_table_name(), "dm-2");
+
+ Holder* holder = staging->find_holder(multipath1->get_sid(),
gpt->get_sid());
+ holder->set_source(multipath2);
+
+ BOOST_CHECK_EQUAL(partition->get_name(), "/dev/mapper/mpathb-part2");
+ BOOST_CHECK_EQUAL(partition->get_dm_table_name(), "");
+}
