Hello community,
here is the log from the commit of package libstorage-ng for openSUSE:Factory checked in at 2019-06-03 18:46:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old)
and /work/SRC/openSUSE:Factory/.libstorage-ng.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng"
Mon Jun 3 18:46:01 2019 rev:57 rq:707256 version:4.1.125
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2019-05-22 15:37:30.978607815 +0200
+++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.5148/libstorage-ng.changes 2019-06-03 18:46:09.620623928 +0200
@@ -1,0 +2,38 @@
+Mon May 27 11:50:03 UTC 2019 - aschnell@suse.de
+
+- merge gh#openSUSE/libstorage-ng#650
+- sort block devices when creating btrfs (needed in testsuite)
+- 4.1.125
+
+--------------------------------------------------------------------
+Fri May 24 12:09:13 UTC 2019 - aschnell@suse.de
+
+- merge gh#openSUSE/libstorage-ng#649
+- use devid from devicegraph when resizing btrfs
+- extended integration test
+- added note
+- fix resizing btrfs on e.g. LVM
+- 4.1.124
+
+--------------------------------------------------------------------
+Thu May 23 16:24:32 UTC 2019 - aschnell@suse.de
+
+- merge gh#openSUSE/libstorage-ng#648
+- allow to reuse commands and files in mockup files
+- read sub uuid in blkid output
+- updated devicegraphs
+- add id to FilesystemUser
+- removed obsolete setenv calls to enable multiple devices btrfs
+- work on btrfs multiple device support
+- 4.1.123
+
+--------------------------------------------------------------------
+Wed May 22 14:18:06 UTC 2019 - jlopez@suse.com
+
+- merge gh#openSUSE/libstorage-ng#647
+- Enable multi-device Btrfs probing by default
+- Bump lib version
+- Enable multi-device Btrfs by default
+- 4.1.122
+
+--------------------------------------------------------------------
Old:
----
libstorage-ng-4.1.121.tar.xz
New:
----
libstorage-ng-4.1.125.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-ng.spec ++++++
--- /var/tmp/diff_new_pack.jLUuYv/_old 2019-06-03 18:46:10.104623762 +0200
+++ /var/tmp/diff_new_pack.jLUuYv/_new 2019-06-03 18:46:10.108623760 +0200
@@ -18,7 +18,7 @@
%define libname %{name}1
Name: libstorage-ng
-Version: 4.1.121
+Version: 4.1.125
Release: 0
Summary: Library for storage management
License: GPL-2.0-only
++++++ libstorage-ng-4.1.121.tar.xz -> libstorage-ng-4.1.125.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/LIBVERSION new/libstorage-ng-4.1.125/LIBVERSION
--- old/libstorage-ng-4.1.121/LIBVERSION 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/LIBVERSION 2019-05-27 13:50:03.000000000 +0200
@@ -1 +1 @@
-1.10.2
+1.11.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/VERSION new/libstorage-ng-4.1.125/VERSION
--- old/libstorage-ng-4.1.121/VERSION 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/VERSION 2019-05-27 13:50:03.000000000 +0200
@@ -1 +1 @@
-4.1.121
+4.1.125
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/integration-tests/filesystems/btrfs/multiple-devices/grow.py new/libstorage-ng-4.1.125/integration-tests/filesystems/btrfs/multiple-devices/grow.py
--- old/libstorage-ng-4.1.121/integration-tests/filesystems/btrfs/multiple-devices/grow.py 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/integration-tests/filesystems/btrfs/multiple-devices/grow.py 2019-05-27 13:50:03.000000000 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/python3
-# requirements: btrfs on /dev/sdc1 and unused /dev/sdd1
+# requirements: btrfs on /dev/sdc1 and /dev/sdd1 and space after both partitions
from storage import *
@@ -18,17 +18,18 @@
print(staging)
-partition = Partition.find_by_name(staging, "/dev/sdc1")
+def grow(partition):
+ region = partition.get_region()
+ region.set_length(int(region.get_length() + 1 * GiB / region.get_block_size()))
+ region = partition.get_partition_table().align(region, AlignPolicy_KEEP_START_ALIGN_END)
+ partition.set_region(region)
-region = partition.get_region()
+sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
+grow(sdc1)
-region.set_length(int(region.get_length() + 1 * GiB / region.get_block_size()))
-
-region = partition.get_partition_table().align(region, AlignPolicy_KEEP_START_ALIGN_END)
-
-partition.set_region(region)
+sdd1 = Partition.find_by_name(staging, "/dev/sdd1")
+grow(sdd1)
print(staging)
-commit(storage)
-
+commit(storage, skip_save_graphs = False)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/storage/Devices/BlkDeviceImpl.cc new/libstorage-ng-4.1.125/storage/Devices/BlkDeviceImpl.cc
--- old/libstorage-ng-4.1.121/storage/Devices/BlkDeviceImpl.cc 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/storage/Devices/BlkDeviceImpl.cc 2019-05-27 13:50:03.000000000 +0200
@@ -457,6 +457,8 @@
/**
* Auxiliary method to get all parent-child relationships: from the device that
* is being resized to the most high-level device that also needs to be resized.
+ *
+ * TODO handle extended partitions (unsupported so far)
*/
vector<DirectRelation>
devices_to_resize(const BlkDevice* blk_device)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/storage/EnvironmentImpl.cc new/libstorage-ng-4.1.125/storage/EnvironmentImpl.cc
--- old/libstorage-ng-4.1.121/storage/EnvironmentImpl.cc 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/storage/EnvironmentImpl.cc 2019-05-27 13:50:03.000000000 +0200
@@ -106,7 +106,7 @@
support_btrfs_multiple_devices()
{
const char* p = getenv("YAST_MULTIPLE_DEVICES_BTRFS");
- return p && strcmp(p, "yes") == 0;
+ return !p || strcmp(p, "yes") == 0;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/storage/Filesystems/BtrfsImpl.cc new/libstorage-ng-4.1.125/storage/Filesystems/BtrfsImpl.cc
--- old/libstorage-ng-4.1.121/storage/Filesystems/BtrfsImpl.cc 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/storage/Filesystems/BtrfsImpl.cc 2019-05-27 13:50:03.000000000 +0200
@@ -36,7 +36,7 @@
#include "storage/UsedFeatures.h"
#include "storage/SystemInfo/SystemInfo.h"
#include "storage/Holders/Subdevice.h"
-#include "storage/Holders/FilesystemUser.h"
+#include "storage/Holders/FilesystemUserImpl.h"
#include "storage/EnvironmentImpl.h"
#include "storage/Storage.h"
#include "storage/Utils/Mockup.h"
@@ -388,19 +388,29 @@
if (detected_btrfs.devices.empty())
ST_THROW(Exception("btrfs has no blk devices"));
- vector blk_devices;
+ // generate list of blk_device and corresponding id (btrfs devid)
+ vector> blk_devices;
for (const CmdBtrfsFilesystemShow::Device& device : detected_btrfs.devices)
- blk_devices.push_back(BlkDevice::find_by_any_name(system, device.name));
+ blk_devices.emplace_back(BlkDevice::find_by_any_name(system, device.name), device.id);
BlkFilesystem* blk_filesystem = nullptr;
- for (BlkDevice* blk_device : blk_devices)
+ for (const pair& blk_device : blk_devices)
{
+ FilesystemUser* filesystem_user = nullptr;
+
if (!blk_filesystem)
- blk_filesystem = blk_device->create_blk_filesystem(FsType::BTRFS);
+ {
+ blk_filesystem = blk_device.first->create_blk_filesystem(FsType::BTRFS);
+ filesystem_user = to_filesystem_user(blk_filesystem->get_in_holders().front());
+ }
else
- FilesystemUser::create(system, blk_device, blk_filesystem);
+ {
+ filesystem_user = FilesystemUser::create(system, blk_device.first, blk_filesystem);
+ }
+
+ filesystem_user->get_impl().set_id(blk_device.second);
}
if (!blk_filesystem)
@@ -712,7 +722,10 @@
if (!get_mkfs_options().empty())
cmd_line += " " + get_mkfs_options();
- for (const BlkDevice* blk_device : get_blk_devices())
+ // sort is required for testsuite
+ vector blk_devices = get_blk_devices();
+ sort(blk_devices.begin(), blk_devices.end(), BlkDevice::compare_by_name);
+ for (const BlkDevice* blk_device : blk_devices)
cmd_line += " " + quote(blk_device->get_name());
wait_for_devices();
@@ -733,34 +746,6 @@
}
- namespace
- {
-
- // TODO aliases, maybe just add devid to FilesystemUser during probing
-
- unsigned int
- devid(const string& uuid, const string& name)
- {
- SystemInfo system_info;
-
- const CmdBtrfsFilesystemShow& cmd_btrfs_filesystem_show = system_info.getCmdBtrfsFilesystemShow();
-
- const CmdBtrfsFilesystemShow::const_iterator& it = cmd_btrfs_filesystem_show.find_by_uuid(uuid);
- if (it == cmd_btrfs_filesystem_show.end())
- ST_THROW(Exception(sformat("btrfs not found by uuid %s", uuid)));
-
- for (const CmdBtrfsFilesystemShow::Device& device : it->devices)
- {
- if (device.name == name)
- return device.id;
- }
-
- ST_THROW(Exception(sformat("device %s of btrfs with uuid %s not found", name, uuid)));
- }
-
- }
-
-
Text
Btrfs::Impl::do_resize_text(ResizeMode resize_mode, const Device* lhs, const Device* rhs,
const BlkDevice* blk_device, Tense tense) const
@@ -794,11 +779,15 @@
{
EnsureMounted ensure_mounted(get_filesystem(), false);
- string cmd_line = BTRFSBIN " filesystem resize " + to_string(devid(get_uuid(), blk_device->get_name())) + ":";
- if (resize_mode == ResizeMode::SHRINK)
- cmd_line += to_string(blk_device->get_size());
- else
- cmd_line += "max";
+ const FilesystemUser* filesystem_user = to_filesystem_user(get_devicegraph()->find_holder(blk_device->get_sid(),
+ get_sid()));
+ unsigned int devid = filesystem_user->get_impl().get_id();
+
+ string cmd_line = BTRFSBIN " filesystem resize " + to_string(devid) + ":";
+ if (resize_mode == ResizeMode::SHRINK)
+ cmd_line += to_string(blk_device->get_size());
+ else
+ cmd_line += "max";
cmd_line += " " + quote(ensure_mounted.get_any_mount_point());
SystemCmd cmd(cmd_line, SystemCmd::DoThrow);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/storage/Holders/FilesystemUserImpl.cc new/libstorage-ng-4.1.125/storage/Holders/FilesystemUserImpl.cc
--- old/libstorage-ng-4.1.121/storage/Holders/FilesystemUserImpl.cc 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/storage/Holders/FilesystemUserImpl.cc 2019-05-27 13:50:03.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) [2016-2017] SUSE LLC
+ * Copyright (c) [2016-2019] SUSE LLC
*
* All Rights Reserved.
*
@@ -32,9 +32,11 @@
FilesystemUser::Impl::Impl(const xmlNode* node)
- : User::Impl(node), journal(false)
+ : User::Impl(node), journal(false), id(0)
{
getChildValue(node, "journal", journal);
+
+ getChildValue(node, "id", id);
}
@@ -44,6 +46,8 @@
User::Impl::save(node);
setChildValueIf(node, "journal", journal, journal);
+
+ setChildValueIf(node, "id", id, id);
}
@@ -55,7 +59,7 @@
if (!User::Impl::equal(rhs))
return false;
- return journal == rhs.journal;
+ return journal == rhs.journal && id == rhs.id;
}
@@ -67,6 +71,8 @@
User::Impl::log_diff(log, rhs);
storage::log_diff(log, "journal", journal, rhs.journal);
+
+ storage::log_diff(log, "id", id, rhs.id);
}
@@ -77,6 +83,9 @@
if (journal)
out << " journal";
+
+ if (id)
+ out << " id:" << id;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/storage/Holders/FilesystemUserImpl.h new/libstorage-ng-4.1.125/storage/Holders/FilesystemUserImpl.h
--- old/libstorage-ng-4.1.121/storage/Holders/FilesystemUserImpl.h 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/storage/Holders/FilesystemUserImpl.h 2019-05-27 13:50:03.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) [2016-2017] SUSE LLC
+ * Copyright (c) [2016-2019] SUSE LLC
*
* All Rights Reserved.
*
@@ -39,7 +39,7 @@
public:
Impl()
- : User::Impl(), journal(false) {}
+ : User::Impl(), journal(false), id(0) {}
Impl(const xmlNode* node);
@@ -57,10 +57,19 @@
bool is_journal() const { return journal; }
void set_journal(bool journal) { Impl::journal = journal; }
+ unsigned int get_id() const { return id; }
+ void set_id(unsigned int id) { Impl::id = id; }
+
private:
bool journal;
+ /**
+ * An id for the block device as seen from the filesystem. So
+ * far only used for btrfs where it is the btrfs devid.
+ */
+ unsigned int id;
+
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/storage/SystemInfo/CmdBlkid.cc new/libstorage-ng-4.1.125/storage/SystemInfo/CmdBlkid.cc
--- old/libstorage-ng-4.1.121/storage/SystemInfo/CmdBlkid.cc 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/storage/SystemInfo/CmdBlkid.cc 2019-05-27 13:50:03.000000000 +0200
@@ -114,6 +114,10 @@
it1 = m.find("EXT_JOURNAL");
if (it1 != m.end())
entry.fs_journal_uuid = it1->second;
+
+ it1 = m.find("UUID_SUB");
+ if (it1 != m.end())
+ entry.fs_sub_uuid = it1->second;
}
if (entry.is_journal)
@@ -295,6 +299,8 @@
s << " fs-label:" << entry.fs_label;
if (!entry.fs_journal_uuid.empty())
s << " fs-journal-uuid:" << entry.fs_journal_uuid;
+ if (!entry.fs_sub_uuid.empty())
+ s << " fs-sub-uuid:" << entry.fs_sub_uuid;
}
if (entry.is_journal)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/storage/SystemInfo/CmdBlkid.h new/libstorage-ng-4.1.125/storage/SystemInfo/CmdBlkid.h
--- old/libstorage-ng-4.1.121/storage/SystemInfo/CmdBlkid.h 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/storage/SystemInfo/CmdBlkid.h 2019-05-27 13:50:03.000000000 +0200
@@ -57,7 +57,7 @@
struct Entry
{
Entry() : is_fs(false), fs_type(FsType::UNKNOWN), fs_uuid(), fs_label(), fs_journal_uuid(),
- is_journal(false), journal_uuid(), is_md(false), is_lvm(false),
+ fs_sub_uuid(), is_journal(false), journal_uuid(), is_md(false), is_lvm(false),
is_luks(false), luks_uuid(), luks_label(), is_bcache(false), bcache_uuid() {}
bool is_fs;
@@ -65,6 +65,7 @@
string fs_uuid;
string fs_label;
string fs_journal_uuid;
+ string fs_sub_uuid;
bool is_journal;
string journal_uuid;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/storage/Utils/Mockup.cc new/libstorage-ng-4.1.125/storage/Utils/Mockup.cc
--- old/libstorage-ng-4.1.121/storage/Utils/Mockup.cc 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/storage/Utils/Mockup.cc 2019-05-27 13:50:03.000000000 +0200
@@ -49,16 +49,41 @@
{
for (const xmlNode* command_node : getChildNodes(commands_node))
{
- string name;
- getChildValue(command_node, "name", name);
+ vector<string> names;
+ getChildValue(command_node, "name", names);
+
+ if (names.empty())
+ ST_THROW(Exception("no name for command found"));
Command command;
getChildValue(command_node, "stdout", command.stdout);
getChildValue(command_node, "stderr", command.stderr);
getChildValue(command_node, "exit-code", command.exit_code);
- if (!commands.emplace(name, command).second)
- ST_THROW(Exception(sformat("command \"%s\" already loaded for mockup", name)));
+#ifdef OCCAMS_RAZOR
+ // Unfortunately the check is not so effective as one
+ // might expected since the output of udevadm info is
+ // often sorted differently depending on the
+ // parameter.
+
+ if (command.stdout.size() > threshold)
+ {
+ for (const map::value_type& tmp : commands)
+ {
+ if (tmp.second == command)
+ {
+ y2err("identical commands in mockup '" << tmp.first << "' and '" << names[0]);
+ ST_THROW(Exception("Occam's Razor"));
+ }
+ }
+ }
+#endif
+
+ for (const string& name : names)
+ {
+ if (!commands.emplace(name, command).second)
+ ST_THROW(Exception(sformat("command \"%s\" already loaded for mockup", name)));
+ }
}
}
@@ -67,14 +92,34 @@
{
for (const xmlNode* file_node : getChildNodes(files_node))
{
- string name;
- getChildValue(file_node, "name", name);
+ vector<string> names;
+ getChildValue(file_node, "name", names);
+
+ if (names.empty())
+ ST_THROW(Exception("no name for file found"));
File file;
getChildValue(file_node, "content", file.content);
- if (!files.emplace(name, file).second)
- ST_THROW(Exception(sformat("file \"%s\" already loaded for mockup", name)));
+#ifdef OCCAMS_RAZOR
+ if (file.content.size() > threshold)
+ {
+ for (const map::value_type& tmp : files)
+ {
+ if (tmp.second == file)
+ {
+ y2err("identical files in mockup '" << tmp.first << "' and '" << names[0]);
+ ST_THROW(Exception("Occam's Razor"));
+ }
+ }
+ }
+#endif
+
+ for (const string& name : names)
+ {
+ if (!files.emplace(name, file).second)
+ ST_THROW(Exception(sformat("file \"%s\" already loaded for mockup", name)));
+ }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/storage/Utils/Mockup.h new/libstorage-ng-4.1.125/storage/Utils/Mockup.h
--- old/libstorage-ng-4.1.121/storage/Utils/Mockup.h 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/storage/Utils/Mockup.h 2019-05-27 13:50:03.000000000 +0200
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2015 Novell, Inc.
- * Copyright (c) [2017-2018] SUSE LLC
+ * Copyright (c) [2017-2019] SUSE LLC
*
* All Rights Reserved.
*
@@ -35,8 +35,11 @@
/**
* With Occam's Razor an exception is thrown when not all entries in
* the mockup are used and Mockup::occams_razor() is called (which is
- * done after probing when reading the mockup). Enable only for
- * development code but not for production code.
+ * done after probing when reading the mockup). Also during loading
+ * the mockup an exception is thrown when big identical commands or
+ * files are found.
+ *
+ * Enable only for development code but not for production code.
*/
// #define OCCAMS_RAZOR
@@ -86,6 +89,8 @@
static map files;
#ifdef OCCAMS_RAZOR
+ const static size_t threshold = 4;
+
static set<string> used_commands;
static set<string> used_files;
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/storage/Utils/Remote.cc new/libstorage-ng-4.1.125/storage/Utils/Remote.cc
--- old/libstorage-ng-4.1.121/storage/Utils/Remote.cc 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/storage/Utils/Remote.cc 2019-05-27 13:50:03.000000000 +0200
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2015 Novell, Inc.
+ * Copyright (c) 2019 SUSE LLC
*
* All Rights Reserved.
*
@@ -29,6 +30,20 @@
static const RemoteCallbacks* remote_callbacks = nullptr;
+ bool
+ RemoteCommand::operator==(const RemoteCommand& rhs) const
+ {
+ return stdout == rhs.stdout && stderr == rhs.stderr && exit_code == rhs.exit_code;
+ }
+
+
+ bool
+ RemoteFile::operator==(const RemoteFile& rhs) const
+ {
+ return content == rhs.content;
+ }
+
+
const RemoteCallbacks*
get_remote_callbacks()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/storage/Utils/Remote.h new/libstorage-ng-4.1.125/storage/Utils/Remote.h
--- old/libstorage-ng-4.1.121/storage/Utils/Remote.h 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/storage/Utils/Remote.h 2019-05-27 13:50:03.000000000 +0200
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2015 Novell, Inc.
+ * Copyright (c) 2019 SUSE LLC
*
* All Rights Reserved.
*
@@ -49,6 +50,11 @@
std::vectorstd::string stdout;
std::vectorstd::string stderr;
int exit_code;
+
+ /**
+ * Compare stdout, stderr and exit_code of two RemoteCommands
+ */
+ bool operator==(const RemoteCommand& rhs) const;
};
@@ -61,6 +67,11 @@
RemoteFile(const std::vectorstd::string& content) : content(content) {}
std::vectorstd::string content;
+
+ /**
+ * Compare content of two Remotefiles.
+ */
+ bool operator==(const RemoteFile& rhs) const;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/SystemInfo/blkid.cc new/libstorage-ng-4.1.125/testsuite/SystemInfo/blkid.cc
--- old/libstorage-ng-4.1.121/testsuite/SystemInfo/blkid.cc 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/SystemInfo/blkid.cc 2019-05-27 13:50:03.000000000 +0200
@@ -78,7 +78,7 @@
vector<string> output = {
"data[/dev/mapper/docker-254:3-266193-pool] -> is-fs:true fs-type:ext4 fs-uuid:b8965f68-1e7c-4fac-982b-5859dca91de5",
"data[/dev/mapper/system-abuild] -> is-fs:true fs-type:ext4 fs-uuid:16337c60-fc2a-4b87-8199-4f511fa06c65 fs-label:ABUILD",
- "data[/dev/mapper/system-btrfs] -> is-fs:true fs-type:btrfs fs-uuid:946de1e3-ab5a-49d2-8c9d-057f1613d395 fs-label:BTRFS",
+ "data[/dev/mapper/system-btrfs] -> is-fs:true fs-type:btrfs fs-uuid:946de1e3-ab5a-49d2-8c9d-057f1613d395 fs-label:BTRFS fs-sub-uuid:8fd5c226-d060-4049-90e6-1df5c865fdf4",
"data[/dev/mapper/system-giant] -> is-fs:true fs-type:xfs fs-uuid:0857a01f-c58e-464a-b74b-cd46992873e7 fs-label:GIANT",
"data[/dev/mapper/system-root] -> is-fs:true fs-type:ext3 fs-uuid:31e381c9-5b35-4045-8d01-9274a30e1298 fs-label:ROOT",
"data[/dev/mapper/system-swap] -> is-fs:true fs-type:swap fs-uuid:fd39c3f9-2990-435d-8eed-e56b6dc2e592 fs-label:SWAP",
@@ -102,8 +102,8 @@
};
vector<string> output = {
- "data[/dev/mapper/system-home] -> is-fs:true fs-type:btrfs fs-uuid:7e9e18c3-b743-47d8-9f33-464f466fc517",
- "data[/dev/mapper/system-root] -> is-fs:true fs-type:btrfs fs-uuid:9fca85ff-4278-4f49-932e-4060726cf0d6",
+ "data[/dev/mapper/system-home] -> is-fs:true fs-type:btrfs fs-uuid:7e9e18c3-b743-47d8-9f33-464f466fc517 fs-sub-uuid:4f40002c-125e-43c1-8a38-b5bf29f5319c",
+ "data[/dev/mapper/system-root] -> is-fs:true fs-type:btrfs fs-uuid:9fca85ff-4278-4f49-932e-4060726cf0d6 fs-sub-uuid:ab28e20a-9c11-4ea6-a46d-0fe412fe0e19",
"data[/dev/mapper/system-swap] -> is-fs:true fs-type:swap fs-uuid:d0f020a1-9847-4ee5-a22e-fe0cdd4aa905",
"data[/dev/mapper/tmp] -> is-lvm:true",
"data[/dev/sda1] -> is-fs:true fs-type:ext4 fs-uuid:fc5985ee-e069-4bb4-a36c-24d8f6022f7a",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/dependencies/partitions/rename1-probed.xml new/libstorage-ng-4.1.125/testsuite/dependencies/partitions/rename1-probed.xml
--- old/libstorage-ng-4.1.121/testsuite/dependencies/partitions/rename1-probed.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/dependencies/partitions/rename1-probed.xml 2019-05-27 13:50:03.000000000 +0200
@@ -150,22 +150,22 @@
<source-sid>44</source-sid>
<target-sid>48</target-sid>
</Subdevice>
- <User>
+ <FilesystemUser>
<source-sid>45</source-sid>
<target-sid>64</target-sid>
- </User>
- <User>
+ </FilesystemUser>
+ <FilesystemUser>
<source-sid>46</source-sid>
<target-sid>65</target-sid>
- </User>
- <User>
+ </FilesystemUser>
+ <FilesystemUser>
<source-sid>47</source-sid>
<target-sid>66</target-sid>
- </User>
- <User>
+ </FilesystemUser>
+ <FilesystemUser>
<source-sid>48</source-sid>
<target-sid>67</target-sid>
- </User>
+ </FilesystemUser>
<User>
<source-sid>66</source-sid>
<target-sid>1000</target-sid>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/dependencies/partitions/rename1-staging.xml new/libstorage-ng-4.1.125/testsuite/dependencies/partitions/rename1-staging.xml
--- old/libstorage-ng-4.1.121/testsuite/dependencies/partitions/rename1-staging.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/dependencies/partitions/rename1-staging.xml 2019-05-27 13:50:03.000000000 +0200
@@ -130,14 +130,14 @@
<source-sid>44</source-sid>
<target-sid>48</target-sid>
</Subdevice>
- <User>
+ <FilesystemUser>
<source-sid>47</source-sid>
<target-sid>66</target-sid>
- </User>
- <User>
+ </FilesystemUser>
+ <FilesystemUser>
<source-sid>48</source-sid>
<target-sid>67</target-sid>
- </User>
+ </FilesystemUser>
<Subdevice>
<source-sid>44</source-sid>
<target-sid>74</target-sid>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/dependencies/partitions/rename2-probed.xml new/libstorage-ng-4.1.125/testsuite/dependencies/partitions/rename2-probed.xml
--- old/libstorage-ng-4.1.121/testsuite/dependencies/partitions/rename2-probed.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/dependencies/partitions/rename2-probed.xml 2019-05-27 13:50:03.000000000 +0200
@@ -95,18 +95,18 @@
<source-sid>52</source-sid>
<target-sid>54</target-sid>
</Subdevice>
- <User>
+ <FilesystemUser>
<source-sid>53</source-sid>
<target-sid>66</target-sid>
- </User>
+ </FilesystemUser>
<User>
<source-sid>66</source-sid>
<target-sid>67</target-sid>
</User>
- <User>
+ <FilesystemUser>
<source-sid>54</source-sid>
<target-sid>68</target-sid>
- </User>
+ </FilesystemUser>
<User>
<source-sid>68</source-sid>
<target-sid>69</target-sid>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/dependencies/partitions/rename2-staging.xml new/libstorage-ng-4.1.125/testsuite/dependencies/partitions/rename2-staging.xml
--- old/libstorage-ng-4.1.121/testsuite/dependencies/partitions/rename2-staging.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/dependencies/partitions/rename2-staging.xml 2019-05-27 13:50:03.000000000 +0200
@@ -110,18 +110,18 @@
<source-sid>52</source-sid>
<target-sid>54</target-sid>
</Subdevice>
- <User>
+ <FilesystemUser>
<source-sid>53</source-sid>
<target-sid>66</target-sid>
- </User>
+ </FilesystemUser>
<User>
<source-sid>66</source-sid>
<target-sid>67</target-sid>
</User>
- <User>
+ <FilesystemUser>
<source-sid>54</source-sid>
<target-sid>68</target-sid>
- </User>
+ </FilesystemUser>
<User>
<source-sid>68</source-sid>
<target-sid>69</target-sid>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/dependencies/partitions/rename3-probed.xml new/libstorage-ng-4.1.125/testsuite/dependencies/partitions/rename3-probed.xml
--- old/libstorage-ng-4.1.121/testsuite/dependencies/partitions/rename3-probed.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/dependencies/partitions/rename3-probed.xml 2019-05-27 13:50:03.000000000 +0200
@@ -116,18 +116,18 @@
<source-sid>52</source-sid>
<target-sid>55</target-sid>
</Subdevice>
- <User>
+ <FilesystemUser>
<source-sid>54</source-sid>
<target-sid>67</target-sid>
- </User>
+ </FilesystemUser>
<User>
<source-sid>67</source-sid>
<target-sid>68</target-sid>
</User>
- <User>
+ <FilesystemUser>
<source-sid>55</source-sid>
<target-sid>69</target-sid>
- </User>
+ </FilesystemUser>
<User>
<source-sid>69</source-sid>
<target-sid>70</target-sid>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/dependencies/partitions/rename3-staging.xml new/libstorage-ng-4.1.125/testsuite/dependencies/partitions/rename3-staging.xml
--- old/libstorage-ng-4.1.121/testsuite/dependencies/partitions/rename3-staging.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/dependencies/partitions/rename3-staging.xml 2019-05-27 13:50:03.000000000 +0200
@@ -95,18 +95,18 @@
<source-sid>52</source-sid>
<target-sid>55</target-sid>
</Subdevice>
- <User>
+ <FilesystemUser>
<source-sid>54</source-sid>
<target-sid>67</target-sid>
- </User>
+ </FilesystemUser>
<User>
<source-sid>67</source-sid>
<target-sid>68</target-sid>
</User>
- <User>
+ <FilesystemUser>
<source-sid>55</source-sid>
<target-sid>69</target-sid>
- </User>
+ </FilesystemUser>
<User>
<source-sid>69</source-sid>
<target-sid>70</target-sid>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/dependencies/resize/resize6.cc new/libstorage-ng-4.1.125/testsuite/dependencies/resize/resize6.cc
--- old/libstorage-ng-4.1.121/testsuite/dependencies/resize/resize6.cc 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/dependencies/resize/resize6.cc 2019-05-27 13:50:03.000000000 +0200
@@ -13,8 +13,6 @@
BOOST_AUTO_TEST_CASE(multidevice_btrfs_dependencies)
{
- setenv("YAST_MULTIPLE_DEVICES_BTRFS", "yes", 1);
-
set_logger(get_stdout_logger());
// Check that a multi-device btrfs is properly grown after resizing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/partitions/resize-info.cc new/libstorage-ng-4.1.125/testsuite/partitions/resize-info.cc
--- old/libstorage-ng-4.1.121/testsuite/partitions/resize-info.cc 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/partitions/resize-info.cc 2019-05-27 13:50:03.000000000 +0200
@@ -145,8 +145,6 @@
*/
BOOST_AUTO_TEST_CASE(multidevice_btrfs)
{
- setenv("YAST_MULTIPLE_DEVICES_BTRFS", "yes", 1);
-
set_logger(get_stdout_logger());
Environment environment(true, ProbeMode::READ_DEVICEGRAPH, TargetMode::DIRECT);
@@ -186,8 +184,6 @@
*/
BOOST_AUTO_TEST_CASE(multidevice_btrfs_encryption)
{
- setenv("YAST_MULTIPLE_DEVICES_BTRFS", "yes", 1);
-
set_logger(get_stdout_logger());
Environment environment(true, ProbeMode::READ_DEVICEGRAPH, TargetMode::DIRECT);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/probe/bcache1-mockup.xml new/libstorage-ng-4.1.125/testsuite/probe/bcache1-mockup.xml
--- old/libstorage-ng-4.1.121/testsuite/probe/bcache1-mockup.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/probe/bcache1-mockup.xml 2019-05-27 13:50:03.000000000 +0200
@@ -117,6 +117,7 @@
</Command>
<Command>
<name>/sbin/udevadm info '/dev/bcache0'</name>
+ <name>/sbin/udevadm info '/dev/block/253:0'</name>
<stdout>P: /devices/virtual/block/bcache0</stdout>
<stdout>N: bcache0</stdout>
<stdout>E: DEVNAME=/dev/bcache0</stdout>
@@ -168,6 +169,7 @@
</Command>
<Command>
<name>/sbin/udevadm info '/dev/bcache1'</name>
+ <name>/sbin/udevadm info '/dev/block/253:128'</name>
<stdout>P: /devices/virtual/block/bcache1</stdout>
<stdout>N: bcache1</stdout>
<stdout>E: DEVNAME=/dev/bcache1</stdout>
@@ -182,6 +184,7 @@
</Command>
<Command>
<name>/sbin/udevadm info '/dev/bcache2'</name>
+ <name>/sbin/udevadm info '/dev/block/253:256'</name>
<stdout>P: /devices/virtual/block/bcache2</stdout>
<stdout>N: bcache2</stdout>
<stdout>E: DEVNAME=/dev/bcache2</stdout>
@@ -251,74 +254,6 @@
<stdout></stdout>
</Command>
<Command>
- <name>/sbin/udevadm info '/dev/block/253:0'</name>
- <stdout>P: /devices/virtual/block/bcache0</stdout>
- <stdout>N: bcache0</stdout>
- <stdout>E: DEVNAME=/dev/bcache0</stdout>
- <stdout>E: DEVPATH=/devices/virtual/block/bcache0</stdout>
- <stdout>E: DEVTYPE=disk</stdout>
- <stdout>E: ID_PART_TABLE_TYPE=gpt</stdout>
- <stdout>E: ID_PART_TABLE_UUID=4963b20b-23e4-4a31-9200-7b89f862d225</stdout>
- <stdout>E: MAJOR=253</stdout>
- <stdout>E: MINOR=0</stdout>
- <stdout>E: SUBSYSTEM=block</stdout>
- <stdout>E: TAGS=:systemd:</stdout>
- <stdout>E: USEC_INITIALIZED=3889861</stdout>
- <stdout></stdout>
- </Command>
- <Command>
- <name>/sbin/udevadm info '/dev/block/253:128'</name>
- <stdout>P: /devices/virtual/block/bcache1</stdout>
- <stdout>N: bcache1</stdout>
- <stdout>E: DEVNAME=/dev/bcache1</stdout>
- <stdout>E: DEVPATH=/devices/virtual/block/bcache1</stdout>
- <stdout>E: DEVTYPE=disk</stdout>
- <stdout>E: MAJOR=253</stdout>
- <stdout>E: MINOR=128</stdout>
- <stdout>E: SUBSYSTEM=block</stdout>
- <stdout>E: TAGS=:systemd:</stdout>
- <stdout>E: USEC_INITIALIZED=3159240755</stdout>
- <stdout></stdout>
- </Command>
- <Command>
- <name>/sbin/udevadm info '/dev/block/253:256'</name>
- <stdout>P: /devices/virtual/block/bcache2</stdout>
- <stdout>N: bcache2</stdout>
- <stdout>E: DEVNAME=/dev/bcache2</stdout>
- <stdout>E: DEVPATH=/devices/virtual/block/bcache2</stdout>
- <stdout>E: DEVTYPE=disk</stdout>
- <stdout>E: MAJOR=253</stdout>
- <stdout>E: MINOR=256</stdout>
- <stdout>E: SUBSYSTEM=block</stdout>
- <stdout>E: TAGS=:systemd:</stdout>
- <stdout>E: USEC_INITIALIZED=4888182570</stdout>
- <stdout></stdout>
- </Command>
- <Command>
- <name>/sbin/udevadm info '/dev/block/254:16'</name>
- <stdout>P: /devices/pci0000:00/0000:00:08.0/virtio3/block/vdb</stdout>
- <stdout>N: vdb</stdout>
- <stdout>S: disk/by-path/pci-0000:00:08.0</stdout>
- <stdout>S: disk/by-path/virtio-pci-0000:00:08.0</stdout>
- <stdout>S: disk/by-uuid/d531d625-9aa0-4958-b660-3656bc43fe6d</stdout>
- <stdout>E: DEVLINKS=/dev/disk/by-path/pci-0000:00:08.0 /dev/disk/by-path/virtio-pci-0000:00:08.0 /dev/disk/by-uuid/d531d625-9aa0-4958-b660-3656bc43fe6d</stdout>
- <stdout>E: DEVNAME=/dev/vdb</stdout>
- <stdout>E: DEVPATH=/devices/pci0000:00/0000:00:08.0/virtio3/block/vdb</stdout>
- <stdout>E: DEVTYPE=disk</stdout>
- <stdout>E: ID_FS_TYPE=bcache</stdout>
- <stdout>E: ID_FS_USAGE=other</stdout>
- <stdout>E: ID_FS_UUID=d531d625-9aa0-4958-b660-3656bc43fe6d</stdout>
- <stdout>E: ID_FS_UUID_ENC=d531d625-9aa0-4958-b660-3656bc43fe6d</stdout>
- <stdout>E: ID_PATH=pci-0000:00:08.0</stdout>
- <stdout>E: ID_PATH_TAG=pci-0000_00_08_0</stdout>
- <stdout>E: MAJOR=254</stdout>
- <stdout>E: MINOR=16</stdout>
- <stdout>E: SUBSYSTEM=block</stdout>
- <stdout>E: TAGS=:systemd:</stdout>
- <stdout>E: USEC_INITIALIZED=3483068</stdout>
- <stdout></stdout>
- </Command>
- <Command>
<name>/sbin/udevadm info '/dev/block/254:32'</name>
<stdout>P: /devices/pci0000:00/0000:00:0b.0/virtio6/block/vdc</stdout>
<stdout>N: vdc</stdout>
@@ -566,6 +501,7 @@
</Command>
<Command>
<name>/sbin/udevadm info '/dev/vdb'</name>
+ <name>/sbin/udevadm info '/dev/block/254:16'</name>
<stdout>P: /devices/pci0000:00/0000:00:08.0/virtio3/block/vdb</stdout>
<stdout>N: vdb</stdout>
<stdout>S: disk/by-path/pci-0000:00:08.0</stdout>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/probe/bcache2-mockup.xml new/libstorage-ng-4.1.125/testsuite/probe/bcache2-mockup.xml
--- old/libstorage-ng-4.1.121/testsuite/probe/bcache2-mockup.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/probe/bcache2-mockup.xml 2019-05-27 13:50:03.000000000 +0200
@@ -75,6 +75,7 @@
</Command>
<Command>
<name>/sbin/udevadm info '/dev/bcache0'</name>
+ <name>/sbin/udevadm info '/dev/block/254:0'</name>
<stdout>P: /devices/virtual/block/bcache0</stdout>
<stdout>N: bcache0</stdout>
<stdout>S: disk/by-uuid/63edf5de-e0ed-4b2c-850b-7a8f2ebd6391</stdout>
@@ -96,6 +97,7 @@
</Command>
<Command>
<name>/sbin/udevadm info '/dev/bcache1'</name>
+ <name>/sbin/udevadm info '/dev/block/254:128'</name>
<stdout>P: /devices/virtual/block/bcache1</stdout>
<stdout>N: bcache1</stdout>
<stdout>E: DEVNAME=/dev/bcache1</stdout>
@@ -178,63 +180,6 @@
</Command>
<Command>
<name>/sbin/udevadm info '/dev/bcache2'</name>
- <stdout>P: /devices/virtual/block/bcache2</stdout>
- <stdout>N: bcache2</stdout>
- <stdout>S: disk/by-uuid/f995a0d1-ff12-4b0e-9190-0c1d39a6968c</stdout>
- <stdout>E: DEVLINKS=/dev/disk/by-uuid/f995a0d1-ff12-4b0e-9190-0c1d39a6968c</stdout>
- <stdout>E: DEVNAME=/dev/bcache2</stdout>
- <stdout>E: DEVPATH=/devices/virtual/block/bcache2</stdout>
- <stdout>E: DEVTYPE=disk</stdout>
- <stdout>E: ID_FS_TYPE=ext4</stdout>
- <stdout>E: ID_FS_USAGE=filesystem</stdout>
- <stdout>E: ID_FS_UUID=f995a0d1-ff12-4b0e-9190-0c1d39a6968c</stdout>
- <stdout>E: ID_FS_UUID_ENC=f995a0d1-ff12-4b0e-9190-0c1d39a6968c</stdout>
- <stdout>E: ID_FS_VERSION=1.0</stdout>
- <stdout>E: MAJOR=254</stdout>
- <stdout>E: MINOR=256</stdout>
- <stdout>E: SUBSYSTEM=block</stdout>
- <stdout>E: TAGS=:systemd:</stdout>
- <stdout>E: USEC_INITIALIZED=269755597</stdout>
- <stdout></stdout>
- </Command>
- <Command>
- <name>/sbin/udevadm info '/dev/block/254:0'</name>
- <stdout>P: /devices/virtual/block/bcache0</stdout>
- <stdout>N: bcache0</stdout>
- <stdout>S: disk/by-uuid/63edf5de-e0ed-4b2c-850b-7a8f2ebd6391</stdout>
- <stdout>E: DEVLINKS=/dev/disk/by-uuid/63edf5de-e0ed-4b2c-850b-7a8f2ebd6391</stdout>
- <stdout>E: DEVNAME=/dev/bcache0</stdout>
- <stdout>E: DEVPATH=/devices/virtual/block/bcache0</stdout>
- <stdout>E: DEVTYPE=disk</stdout>
- <stdout>E: ID_FS_TYPE=ext4</stdout>
- <stdout>E: ID_FS_USAGE=filesystem</stdout>
- <stdout>E: ID_FS_UUID=63edf5de-e0ed-4b2c-850b-7a8f2ebd6391</stdout>
- <stdout>E: ID_FS_UUID_ENC=63edf5de-e0ed-4b2c-850b-7a8f2ebd6391</stdout>
- <stdout>E: ID_FS_VERSION=1.0</stdout>
- <stdout>E: MAJOR=254</stdout>
- <stdout>E: MINOR=0</stdout>
- <stdout>E: SUBSYSTEM=block</stdout>
- <stdout>E: TAGS=:systemd:</stdout>
- <stdout>E: USEC_INITIALIZED=269534529</stdout>
- <stdout></stdout>
- </Command>
- <Command>
- <name>/sbin/udevadm info '/dev/block/254:128'</name>
- <stdout>P: /devices/virtual/block/bcache1</stdout>
- <stdout>N: bcache1</stdout>
- <stdout>E: DEVNAME=/dev/bcache1</stdout>
- <stdout>E: DEVPATH=/devices/virtual/block/bcache1</stdout>
- <stdout>E: DEVTYPE=disk</stdout>
- <stdout>E: ID_PART_TABLE_TYPE=gpt</stdout>
- <stdout>E: ID_PART_TABLE_UUID=15d056be-2b74-9a45-99c0-ef4cceb44e00</stdout>
- <stdout>E: MAJOR=254</stdout>
- <stdout>E: MINOR=128</stdout>
- <stdout>E: SUBSYSTEM=block</stdout>
- <stdout>E: TAGS=:systemd:</stdout>
- <stdout>E: USEC_INITIALIZED=269649949</stdout>
- <stdout></stdout>
- </Command>
- <Command>
<name>/sbin/udevadm info '/dev/block/254:256'</name>
<stdout>P: /devices/virtual/block/bcache2</stdout>
<stdout>N: bcache2</stdout>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/probe/btrfs1-devicegraph.xml new/libstorage-ng-4.1.125/testsuite/probe/btrfs1-devicegraph.xml
--- old/libstorage-ng-4.1.121/testsuite/probe/btrfs1-devicegraph.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/probe/btrfs1-devicegraph.xml 2019-05-27 13:50:03.000000000 +0200
@@ -514,6 +514,7 @@
<FilesystemUser>
<source-sid>45</source-sid>
<target-sid>48</target-sid>
+ <id>1</id>
</FilesystemUser>
<Subdevice>
<source-sid>49</source-sid>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/probe/btrfs1.cc new/libstorage-ng-4.1.125/testsuite/probe/btrfs1.cc
--- old/libstorage-ng-4.1.121/testsuite/probe/btrfs1.cc 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/probe/btrfs1.cc 2019-05-27 13:50:03.000000000 +0200
@@ -19,8 +19,6 @@
BOOST_AUTO_TEST_CASE(probe)
{
- setenv("YAST_MULTIPLE_DEVICES_BTRFS", "yes", 1);
-
set_logger(get_stdout_logger());
Environment environment(true, ProbeMode::READ_MOCKUP, TargetMode::DIRECT);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/probe/btrfs2-devicegraph.xml new/libstorage-ng-4.1.125/testsuite/probe/btrfs2-devicegraph.xml
--- old/libstorage-ng-4.1.121/testsuite/probe/btrfs2-devicegraph.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/probe/btrfs2-devicegraph.xml 2019-05-27 13:50:03.000000000 +0200
@@ -384,18 +384,22 @@
<FilesystemUser>
<source-sid>52</source-sid>
<target-sid>63</target-sid>
+ <id>1</id>
</FilesystemUser>
<FilesystemUser>
<source-sid>54</source-sid>
<target-sid>63</target-sid>
+ <id>2</id>
</FilesystemUser>
<FilesystemUser>
<source-sid>56</source-sid>
<target-sid>63</target-sid>
+ <id>3</id>
</FilesystemUser>
<FilesystemUser>
<source-sid>58</source-sid>
<target-sid>63</target-sid>
+ <id>4</id>
</FilesystemUser>
<Subdevice>
<source-sid>64</source-sid>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/probe/btrfs2.cc new/libstorage-ng-4.1.125/testsuite/probe/btrfs2.cc
--- old/libstorage-ng-4.1.121/testsuite/probe/btrfs2.cc 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/probe/btrfs2.cc 2019-05-27 13:50:03.000000000 +0200
@@ -24,8 +24,6 @@
*/
BOOST_AUTO_TEST_CASE(probe)
{
- setenv("YAST_MULTIPLE_DEVICES_BTRFS", "yes", 1);
-
set_logger(get_stdout_logger());
Environment environment(true, ProbeMode::READ_MOCKUP, TargetMode::DIRECT);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/probe/md-ddf1-mockup.xml new/libstorage-ng-4.1.125/testsuite/probe/md-ddf1-mockup.xml
--- old/libstorage-ng-4.1.121/testsuite/probe/md-ddf1-mockup.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/probe/md-ddf1-mockup.xml 2019-05-27 13:50:03.000000000 +0200
@@ -36,6 +36,7 @@
</Command>
<Command>
<name>/sbin/mdadm --detail '/dev/md/a' --export</name>
+ <name>/sbin/mdadm --detail '/dev/md126' --export</name>
<stdout>MD_LEVEL=raid0</stdout>
<stdout>MD_DEVICES=2</stdout>
<stdout>MD_CONTAINER=/dev/md/ddf0</stdout>
@@ -49,32 +50,6 @@
</Command>
<Command>
<name>/sbin/mdadm --detail '/dev/md/b' --export</name>
- <stdout>MD_LEVEL=raid1</stdout>
- <stdout>MD_DEVICES=2</stdout>
- <stdout>MD_CONTAINER=/dev/md/ddf0</stdout>
- <stdout>MD_MEMBER=1</stdout>
- <stdout>MD_UUID=7176ee6c:157fad2a:03304d57:5154c195</stdout>
- <stdout>MD_DEVNAME=b</stdout>
- <stdout>MD_DEVICE_sdd_ROLE=1</stdout>
- <stdout>MD_DEVICE_sdd_DEV=/dev/sdd</stdout>
- <stdout>MD_DEVICE_sdb_ROLE=0</stdout>
- <stdout>MD_DEVICE_sdb_DEV=/dev/sdb</stdout>
- </Command>
- <Command>
- <name>/sbin/mdadm --detail '/dev/md/ddf0' --export</name>
- <stdout>MD_LEVEL=container</stdout>
- <stdout>MD_DEVICES=3</stdout>
- <stdout>MD_METADATA=ddf</stdout>
- <stdout>MD_UUID=ff03741d:35e167d9:7975b563:f63ad6a1</stdout>
- <stdout>MD_DEVNAME=ddf0</stdout>
- <stdout>MD_DEVICE_sdc_ROLE=spare</stdout>
- <stdout>MD_DEVICE_sdc_DEV=/dev/sdc</stdout>
- <stdout>MD_DEVICE_sdd_ROLE=spare</stdout>
- <stdout>MD_DEVICE_sdd_DEV=/dev/sdd</stdout>
- <stdout>MD_DEVICE_sdb_ROLE=spare</stdout>
- <stdout>MD_DEVICE_sdb_DEV=/dev/sdb</stdout>
- </Command>
- <Command>
<name>/sbin/mdadm --detail '/dev/md125' --export</name>
<stdout>MD_LEVEL=raid1</stdout>
<stdout>MD_DEVICES=2</stdout>
@@ -88,19 +63,7 @@
<stdout>MD_DEVICE_sdb_DEV=/dev/sdb</stdout>
</Command>
<Command>
- <name>/sbin/mdadm --detail '/dev/md126' --export</name>
- <stdout>MD_LEVEL=raid0</stdout>
- <stdout>MD_DEVICES=2</stdout>
- <stdout>MD_CONTAINER=/dev/md/ddf0</stdout>
- <stdout>MD_MEMBER=0</stdout>
- <stdout>MD_UUID=44d1de20:051ec20c:9b464412:c1402fbf</stdout>
- <stdout>MD_DEVNAME=a</stdout>
- <stdout>MD_DEVICE_sdd_ROLE=1</stdout>
- <stdout>MD_DEVICE_sdd_DEV=/dev/sdd</stdout>
- <stdout>MD_DEVICE_sdb_ROLE=0</stdout>
- <stdout>MD_DEVICE_sdb_DEV=/dev/sdb</stdout>
- </Command>
- <Command>
+ <name>/sbin/mdadm --detail '/dev/md/ddf0' --export</name>
<name>/sbin/mdadm --detail '/dev/md127' --export</name>
<stdout>MD_LEVEL=container</stdout>
<stdout>MD_DEVICES=3</stdout>
@@ -204,6 +167,7 @@
</Command>
<Command>
<name>/sbin/udevadm info '/dev/md/ddf0'</name>
+ <name>/sbin/udevadm info '/dev/md127'</name>
<stdout>P: /devices/virtual/block/md127</stdout>
<stdout>N: md127</stdout>
<stdout>L: 100</stdout>
@@ -286,46 +250,6 @@
<stdout>E: USEC_INITIALIZED=126338070</stdout>
</Command>
<Command>
- <name>/sbin/udevadm info '/dev/md127'</name>
- <stdout>P: /devices/virtual/block/md127</stdout>
- <stdout>N: md127</stdout>
- <stdout>L: 100</stdout>
- <stdout>S: disk/by-id/md-uuid-ff03741d:35e167d9:7975b563:f63ad6a1</stdout>
- <stdout>S: md/ddf0</stdout>
- <stdout>E: DEVLINKS=/dev/disk/by-id/md-uuid-ff03741d:35e167d9:7975b563:f63ad6a1 /dev/md/ddf0</stdout>
- <stdout>E: DEVNAME=/dev/md127</stdout>
- <stdout>E: DEVPATH=/devices/virtual/block/md127</stdout>
- <stdout>E: DEVTYPE=disk</stdout>
- <stdout>E: MAJOR=9</stdout>
- <stdout>E: MD_DEVICES=3</stdout>
- <stdout>E: MD_DEVICE_sdb_DEV=/dev/sdb</stdout>
- <stdout>E: MD_DEVICE_sdb_ROLE=spare</stdout>
- <stdout>E: MD_DEVICE_sdc_DEV=/dev/sdc</stdout>
- <stdout>E: MD_DEVICE_sdc_ROLE=spare</stdout>
- <stdout>E: MD_DEVICE_sdd_DEV=/dev/sdd</stdout>
- <stdout>E: MD_DEVICE_sdd_ROLE=spare</stdout>
- <stdout>E: MD_DEVNAME=ddf0</stdout>
- <stdout>E: MD_LEVEL=container</stdout>
- <stdout>E: MD_METADATA=ddf</stdout>
- <stdout>E: MD_UUID=ff03741d:35e167d9:7975b563:f63ad6a1</stdout>
- <stdout>E: MINOR=127</stdout>
- <stdout>E: SUBSYSTEM=block</stdout>
- <stdout>E: SYSTEMD_READY=0</stdout>
- <stdout>E: TAGS=:systemd:</stdout>
- <stdout>E: UDISKS_MD_DEVICES=3</stdout>
- <stdout>E: UDISKS_MD_DEVICE_sdb_DEV=/dev/sdb</stdout>
- <stdout>E: UDISKS_MD_DEVICE_sdb_ROLE=spare</stdout>
- <stdout>E: UDISKS_MD_DEVICE_sdc_DEV=/dev/sdc</stdout>
- <stdout>E: UDISKS_MD_DEVICE_sdc_ROLE=spare</stdout>
- <stdout>E: UDISKS_MD_DEVICE_sdd_DEV=/dev/sdd</stdout>
- <stdout>E: UDISKS_MD_DEVICE_sdd_ROLE=spare</stdout>
- <stdout>E: UDISKS_MD_DEVNAME=ddf0</stdout>
- <stdout>E: UDISKS_MD_LEVEL=container</stdout>
- <stdout>E: UDISKS_MD_METADATA=ddf</stdout>
- <stdout>E: UDISKS_MD_UUID=ff03741d:35e167d9:7975b563:f63ad6a1</stdout>
- <stdout>E: USEC_INITIALIZED=126180619</stdout>
- </Command>
- <Command>
<name>/sbin/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>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/probe/md-imsm1-mockup.xml new/libstorage-ng-4.1.125/testsuite/probe/md-imsm1-mockup.xml
--- old/libstorage-ng-4.1.121/testsuite/probe/md-imsm1-mockup.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/probe/md-imsm1-mockup.xml 2019-05-27 13:50:03.000000000 +0200
@@ -42,6 +42,7 @@
</Command>
<Command>
<name>/sbin/mdadm --detail '/dev/md/a' --export</name>
+ <name>/sbin/mdadm --detail '/dev/md126' --export</name>
<stdout>MD_LEVEL=raid0</stdout>
<stdout>MD_DEVICES=2</stdout>
<stdout>MD_CONTAINER=/dev/md/imsm0</stdout>
@@ -55,32 +56,6 @@
</Command>
<Command>
<name>/sbin/mdadm --detail '/dev/md/b' --export</name>
- <stdout>MD_LEVEL=raid1</stdout>
- <stdout>MD_DEVICES=2</stdout>
- <stdout>MD_CONTAINER=/dev/md/imsm0</stdout>
- <stdout>MD_MEMBER=1</stdout>
- <stdout>MD_UUID=76c4b28a:fdeeacfb:4c011925:c3f3fbe0</stdout>
- <stdout>MD_DEVNAME=b</stdout>
- <stdout>MD_DEVICE_sdc_ROLE=0</stdout>
- <stdout>MD_DEVICE_sdc_DEV=/dev/sdc</stdout>
- <stdout>MD_DEVICE_sdb_ROLE=1</stdout>
- <stdout>MD_DEVICE_sdb_DEV=/dev/sdb</stdout>
- </Command>
- <Command>
- <name>/sbin/mdadm --detail '/dev/md/imsm0' --export</name>
- <stdout>MD_LEVEL=container</stdout>
- <stdout>MD_DEVICES=3</stdout>
- <stdout>MD_METADATA=imsm</stdout>
- <stdout>MD_UUID=955f4f3a:dea4bc4d:f597c49e:c118251c</stdout>
- <stdout>MD_DEVNAME=imsm0</stdout>
- <stdout>MD_DEVICE_sdc_ROLE=spare</stdout>
- <stdout>MD_DEVICE_sdc_DEV=/dev/sdc</stdout>
- <stdout>MD_DEVICE_sdd_ROLE=spare</stdout>
- <stdout>MD_DEVICE_sdd_DEV=/dev/sdd</stdout>
- <stdout>MD_DEVICE_sdb_ROLE=spare</stdout>
- <stdout>MD_DEVICE_sdb_DEV=/dev/sdb</stdout>
- </Command>
- <Command>
<name>/sbin/mdadm --detail '/dev/md125' --export</name>
<stdout>MD_LEVEL=raid1</stdout>
<stdout>MD_DEVICES=2</stdout>
@@ -94,19 +69,7 @@
<stdout>MD_DEVICE_sdb_DEV=/dev/sdb</stdout>
</Command>
<Command>
- <name>/sbin/mdadm --detail '/dev/md126' --export</name>
- <stdout>MD_LEVEL=raid0</stdout>
- <stdout>MD_DEVICES=2</stdout>
- <stdout>MD_CONTAINER=/dev/md/imsm0</stdout>
- <stdout>MD_MEMBER=0</stdout>
- <stdout>MD_UUID=8f600ff3:ccc9872c:539cd6c8:91e3b4a1</stdout>
- <stdout>MD_DEVNAME=a</stdout>
- <stdout>MD_DEVICE_sdd_ROLE=0</stdout>
- <stdout>MD_DEVICE_sdd_DEV=/dev/sdd</stdout>
- <stdout>MD_DEVICE_sdb_ROLE=1</stdout>
- <stdout>MD_DEVICE_sdb_DEV=/dev/sdb</stdout>
- </Command>
- <Command>
+ <name>/sbin/mdadm --detail '/dev/md/imsm0' --export</name>
<name>/sbin/mdadm --detail '/dev/md127' --export</name>
<stdout>MD_LEVEL=container</stdout>
<stdout>MD_DEVICES=3</stdout>
@@ -210,6 +173,7 @@
</Command>
<Command>
<name>/sbin/udevadm info '/dev/md/imsm0'</name>
+ <name>/sbin/udevadm info '/dev/md127'</name>
<stdout>P: /devices/virtual/block/md127</stdout>
<stdout>N: md127</stdout>
<stdout>L: 100</stdout>
@@ -292,46 +256,6 @@
<stdout>E: USEC_INITIALIZED=693228658</stdout>
</Command>
<Command>
- <name>/sbin/udevadm info '/dev/md127'</name>
- <stdout>P: /devices/virtual/block/md127</stdout>
- <stdout>N: md127</stdout>
- <stdout>L: 100</stdout>
- <stdout>S: disk/by-id/md-uuid-00000000:00000000:00000000:00000000</stdout>
- <stdout>S: md/imsm0</stdout>
- <stdout>E: DEVLINKS=/dev/md/imsm0 /dev/disk/by-id/md-uuid-00000000:00000000:00000000:00000000</stdout>
- <stdout>E: DEVNAME=/dev/md127</stdout>
- <stdout>E: DEVPATH=/devices/virtual/block/md127</stdout>
- <stdout>E: DEVTYPE=disk</stdout>
- <stdout>E: MAJOR=9</stdout>
- <stdout>E: MD_DEVICES=3</stdout>
- <stdout>E: MD_DEVICE_sdb_DEV=/dev/sdb</stdout>
- <stdout>E: MD_DEVICE_sdb_ROLE=spare</stdout>
- <stdout>E: MD_DEVICE_sdc_DEV=/dev/sdc</stdout>
- <stdout>E: MD_DEVICE_sdc_ROLE=spare</stdout>
- <stdout>E: MD_DEVICE_sdd_DEV=/dev/sdd</stdout>
- <stdout>E: MD_DEVICE_sdd_ROLE=spare</stdout>
- <stdout>E: MD_DEVNAME=imsm0</stdout>
- <stdout>E: MD_LEVEL=container</stdout>
- <stdout>E: MD_METADATA=imsm</stdout>
- <stdout>E: MD_UUID=00000000:00000000:00000000:00000000</stdout>
- <stdout>E: MINOR=127</stdout>
- <stdout>E: SUBSYSTEM=block</stdout>
- <stdout>E: SYSTEMD_READY=0</stdout>
- <stdout>E: TAGS=:systemd:</stdout>
- <stdout>E: UDISKS_MD_DEVICES=3</stdout>
- <stdout>E: UDISKS_MD_DEVICE_sdb_DEV=/dev/sdb</stdout>
- <stdout>E: UDISKS_MD_DEVICE_sdb_ROLE=spare</stdout>
- <stdout>E: UDISKS_MD_DEVICE_sdc_DEV=/dev/sdc</stdout>
- <stdout>E: UDISKS_MD_DEVICE_sdc_ROLE=spare</stdout>
- <stdout>E: UDISKS_MD_DEVICE_sdd_DEV=/dev/sdd</stdout>
- <stdout>E: UDISKS_MD_DEVICE_sdd_ROLE=spare</stdout>
- <stdout>E: UDISKS_MD_DEVNAME=imsm0</stdout>
- <stdout>E: UDISKS_MD_LEVEL=container</stdout>
- <stdout>E: UDISKS_MD_METADATA=imsm</stdout>
- <stdout>E: UDISKS_MD_UUID=00000000:00000000:00000000:00000000</stdout>
- <stdout>E: USEC_INITIALIZED=704100119</stdout>
- </Command>
- <Command>
<name>/sbin/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>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.1.121/testsuite/probe/md3-mockup.xml new/libstorage-ng-4.1.125/testsuite/probe/md3-mockup.xml
--- old/libstorage-ng-4.1.121/testsuite/probe/md3-mockup.xml 2019-05-21 15:32:06.000000000 +0200
+++ new/libstorage-ng-4.1.125/testsuite/probe/md3-mockup.xml 2019-05-27 13:50:03.000000000 +0200
@@ -54,6 +54,7 @@
</Command>
<Command>
<name>/sbin/mdadm --detail '/dev/md/test2' --export</name>
+ <name>/sbin/mdadm --detail '/dev/md127' --export</name>
<stdout>MD_LEVEL=raid0</stdout>
<stdout>MD_DEVICES=2</stdout>
<stdout>MD_METADATA=1.2</stdout>
@@ -67,6 +68,7 @@
</Command>
<Command>
<name>/sbin/mdadm --detail '/dev/md/test3' --export</name>
+ <name>/sbin/mdadm --detail '/dev/md126' --export</name>
<stdout>MD_LEVEL=raid0</stdout>
<stdout>MD_DEVICES=2</stdout>
<stdout>MD_METADATA=1.2</stdout>
@@ -80,6 +82,7 @@
</Command>
<Command>
<name>/sbin/mdadm --detail '/dev/md/test4' --export</name>
+ <name>/sbin/mdadm --detail '/dev/md_test4' --export</name>
<stdout>MD_LEVEL=raid0</stdout>
<stdout>MD_DEVICES=2</stdout>
<stdout>MD_METADATA=1.2</stdout>
@@ -93,6 +96,7 @@
</Command>
<Command>
<name>/sbin/mdadm --detail '/dev/md/test5' --export</name>
+ <name>/sbin/mdadm --detail '/dev/md_test5' --export</name>
<stdout>MD_LEVEL=raid0</stdout>
<stdout>MD_DEVICES=2</stdout>
<stdout>MD_METADATA=1.2</stdout>
@@ -129,58 +133,6 @@
<stdout>MD_DEVICE_sdb3_DEV=/dev/sdb3</stdout>
</Command>
<Command>
- <name>/sbin/mdadm --detail '/dev/md126' --export</name>
- <stdout>MD_LEVEL=raid0</stdout>
- <stdout>MD_DEVICES=2</stdout>
- <stdout>MD_METADATA=1.2</stdout>
- <stdout>MD_UUID=d18642aa:6cec3364:52da8d3b:e6229373</stdout>
- <stdout>MD_DEVNAME=test3</stdout>
- <stdout>MD_NAME=e146:test3</stdout>
- <stdout>MD_DEVICE_sdb7_ROLE=0</stdout>
- <stdout>MD_DEVICE_sdb7_DEV=/dev/sdb7</stdout>
- <stdout>MD_DEVICE_sdb8_ROLE=1</stdout>
- <stdout>MD_DEVICE_sdb8_DEV=/dev/sdb8</stdout>
- </Command>
- <Command>
- <name>/sbin/mdadm --detail '/dev/md127' --export</name>
- <stdout>MD_LEVEL=raid0</stdout>
- <stdout>MD_DEVICES=2</stdout>
- <stdout>MD_METADATA=1.2</stdout>
- <stdout>MD_UUID=5d1cea4b:8d7dfcb2:3380fe48:b1934d2a</stdout>
- <stdout>MD_DEVNAME=test2</stdout>
- <stdout>MD_NAME=e146:test2</stdout>
- <stdout>MD_DEVICE_sdb6_ROLE=1</stdout>
- <stdout>MD_DEVICE_sdb6_DEV=/dev/sdb6</stdout>
- <stdout>MD_DEVICE_sdb5_ROLE=0</stdout>
- <stdout>MD_DEVICE_sdb5_DEV=/dev/sdb5</stdout>
- </Command>
- <Command>
- <name>/sbin/mdadm --detail '/dev/md_test4' --export</name>
- <stdout>MD_LEVEL=raid0</stdout>
- <stdout>MD_DEVICES=2</stdout>
- <stdout>MD_METADATA=1.2</stdout>
- <stdout>MD_UUID=529c9212:439ae1e7:54ce8595:19604ae5</stdout>
- <stdout>MD_DEVNAME=test4</stdout>
- <stdout>MD_NAME=e146:test4</stdout>
- <stdout>MD_DEVICE_sdb9_ROLE=0</stdout>
- <stdout>MD_DEVICE_sdb9_DEV=/dev/sdb9</stdout>
- <stdout>MD_DEVICE_sdb10_ROLE=1</stdout>
- <stdout>MD_DEVICE_sdb10_DEV=/dev/sdb10</stdout>
- </Command>
- <Command>
- <name>/sbin/mdadm --detail '/dev/md_test5' --export</name>
- <stdout>MD_LEVEL=raid0</stdout>
- <stdout>MD_DEVICES=2</stdout>
- <stdout>MD_METADATA=1.2</stdout>
- <stdout>MD_UUID=04ac694a:d5170a17:75bf9d81:6ec1f71f</stdout>
- <stdout>MD_DEVNAME=test5</stdout>
- <stdout>MD_NAME=e146:test5</stdout>
- <stdout>MD_DEVICE_sdb11_ROLE=0</stdout>
- <stdout>MD_DEVICE_sdb11_DEV=/dev/sdb11</stdout>
- <stdout>MD_DEVICE_sdb12_ROLE=1</stdout>
- <stdout>MD_DEVICE_sdb12_DEV=/dev/sdb12</stdout>
- </Command>
- <Command>
<name>/sbin/multipath -d -v 2 -ll</name>
<stderr>bash: /sbin/multipath: No such file or directory</stderr>
</Command>
@@ -295,6 +247,7 @@
</Command>
<Command>
<name>/sbin/udevadm info '/dev/md/test4'</name>
+ <name>/sbin/udevadm info '/dev/md_test4'</name>
<stdout>P: /devices/virtual/block/md_test4</stdout>
<stdout>N: md_test4</stdout>
<stdout>L: 100</stdout>
@@ -585,40 +538,6 @@
<stdout>E: USEC_INITIALIZED=748610962</stdout>
</Command>
<Command>
- <name>/sbin/udevadm info '/dev/md_test4'</name>
- <stdout>P: /devices/virtual/block/md_test4</stdout>
- <stdout>N: md_test4</stdout>
- <stdout>L: 100</stdout>
- <stdout>S: disk/by-id/md-name-e146:test4</stdout>
- <stdout>S: disk/by-id/md-uuid-529c9212:439ae1e7:54ce8595:19604ae5</stdout>
- <stdout>S: disk/by-uuid/962125b5-4f94-45eb-80cf-272afae52a8f</stdout>
- <stdout>S: md/test4</stdout>
- <stdout>E: DEVLINKS=/dev/disk/by-id/md-name-e146:test4 /dev/disk/by-uuid/962125b5-4f94-45eb-80cf-272afae52a8f /dev/disk/by-id/md-uuid-529c9212:439ae1e7:54ce8595:19604ae5 /dev/md/test4</stdout>
- <stdout>E: DEVNAME=/dev/md_test4</stdout>
- <stdout>E: DEVPATH=/devices/virtual/block/md_test4</stdout>
- <stdout>E: DEVTYPE=disk</stdout>
- <stdout>E: ID_FS_TYPE=ext4</stdout>
- <stdout>E: ID_FS_USAGE=filesystem</stdout>
- <stdout>E: ID_FS_UUID=962125b5-4f94-45eb-80cf-272afae52a8f</stdout>
- <stdout>E: ID_FS_UUID_ENC=962125b5-4f94-45eb-80cf-272afae52a8f</stdout>
- <stdout>E: ID_FS_VERSION=1.0</stdout>
- <stdout>E: MAJOR=9</stdout>
- <stdout>E: MD_DEVICES=2</stdout>
- <stdout>E: MD_DEVICE_sdb10_DEV=/dev/sdb10</stdout>
- <stdout>E: MD_DEVICE_sdb10_ROLE=1</stdout>
- <stdout>E: MD_DEVICE_sdb9_DEV=/dev/sdb9</stdout>
- <stdout>E: MD_DEVICE_sdb9_ROLE=0</stdout>
- <stdout>E: MD_DEVNAME=test4</stdout>
- <stdout>E: MD_LEVEL=raid0</stdout>
- <stdout>E: MD_METADATA=1.2</stdout>
- <stdout>E: MD_NAME=e146:test4</stdout>
- <stdout>E: MD_UUID=529c9212:439ae1e7:54ce8595:19604ae5</stdout>
- <stdout>E: MINOR=512</stdout>
- <stdout>E: SUBSYSTEM=block</stdout>
- <stdout>E: TAGS=:systemd:</stdout>
- <stdout>E: USEC_INITIALIZED=659580246</stdout>
- </Command>
- <Command>
<name>/sbin/udevadm info '/dev/md_test5p1'</name>
<stdout>P: /devices/virtual/block/md_test5/md_test5p1</stdout>
<stdout>N: md_test5p1</stdout>
