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 2022-10-15 16:35:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng" Sat Oct 15 16:35:00 2022 rev:183 rq:1010931 version:4.5.46 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2022-09-14 13:44:49.673870956 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.2275/libstorage-ng.changes 2022-10-15 16:36:16.885983852 +0200 @@ -1,0 +2,7 @@ +Fri Oct 14 12:50:44 UTC 2022 - aschn...@suse.com + +- merge gh#openSUSE/libstorage-ng#899 +- allow to work with other linux flavours +- 4.5.46 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-4.5.45.tar.xz New: ---- libstorage-ng-4.5.46.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.AS58jS/_old 2022-10-15 16:36:18.017986573 +0200 +++ /var/tmp/diff_new_pack.AS58jS/_new 2022-10-15 16:36:18.021986582 +0200 @@ -1,7 +1,7 @@ # # spec file for package libstorage-ng # -# Copyright (c) 2022 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define libname %{name}1 Name: libstorage-ng -Version: 4.5.45 +Version: 4.5.46 Release: 0 Summary: Library for storage management License: GPL-2.0-only Group: System/Libraries -Url: https://github.com/openSUSE/libstorage-ng +URL: https://github.com/openSUSE/libstorage-ng Source: %{name}-%{version}.tar.xz %if 0%{?suse_version} >= 1330 BuildRequires: libboost_headers-devel @@ -139,8 +139,8 @@ %package utils Summary: Utils for libstorage-ng Group: Development/Tools/Other -Recommends: graphviz Recommends: ImageMagick +Recommends: graphviz %description utils This package contains utils for libstorage-ng. ++++++ libstorage-ng-4.5.45.tar.xz -> libstorage-ng-4.5.46.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/LIBVERSION new/libstorage-ng-4.5.46/LIBVERSION --- old/libstorage-ng-4.5.45/LIBVERSION 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/LIBVERSION 2022-10-14 14:50:44.000000000 +0200 @@ -1 +1 @@ -1.80.1 +1.81.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/VERSION new/libstorage-ng-4.5.46/VERSION --- old/libstorage-ng-4.5.45/VERSION 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/VERSION 2022-10-14 14:50:44.000000000 +0200 @@ -1 +1 @@ -4.5.45 +4.5.46 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/configure.ac new/libstorage-ng-4.5.46/configure.ac --- old/libstorage-ng-4.5.45/configure.ac 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/configure.ac 2022-10-14 14:50:44.000000000 +0200 @@ -88,6 +88,9 @@ RUBY_ARCH_NAME=$(RBCONFIG(arch)) AC_SUBST(RUBY_ARCH_NAME) +AC_MSG_RESULT(checking for OS_FLAVOUR... $build_vendor) +AC_DEFINE_UNQUOTED([OS_FLAVOUR], ["$build_vendor"], [Operating system flavour.]) + AC_CONFIG_FILES([ Makefile storage/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/storage/Devices/PartitionImpl.cc new/libstorage-ng-4.5.46/storage/Devices/PartitionImpl.cc --- old/libstorage-ng-4.5.45/storage/Devices/PartitionImpl.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/storage/Devices/PartitionImpl.cc 2022-10-14 14:50:44.000000000 +0200 @@ -916,10 +916,12 @@ do_create_pre_hack(tmps); - // Note: --wipesignatures is not available in upstream parted (2021-07-26). + string cmd_line = PARTED_BIN " --script "; - string cmd_line = PARTED_BIN " --script --wipesignatures " + quote(partitionable->get_name()) + - " unit s mkpart "; + if (PartedVersion::supports_wipe_signatures()) + cmd_line += "--wipesignatures "; + + cmd_line += quote(partitionable->get_name()) + " unit s mkpart "; if (is_msdos(partition_table)) cmd_line += toString(get_type()) + " "; @@ -971,6 +973,12 @@ if (get_type() == PartitionType::PRIMARY || get_type() == PartitionType::LOGICAL) { + if (!PartedVersion::supports_wipe_signatures()) + { + SystemCmd(UDEVADM_BIN_SETTLE); + wipe_device(); + } + discard_device(); } @@ -1040,8 +1048,12 @@ for (unsigned int i = 0; i < tmps.size(); ++i) { - string cmd_line = PARTED_BIN " --script --wipesignatures " + quote(partitionable->get_name()) + - " unit s mkpart "; + string cmd_line = PARTED_BIN " --script "; + + if (PartedVersion::supports_wipe_signatures()) + cmd_line += "--wipesignatures "; + + cmd_line += quote(partitionable->get_name()) + " unit s mkpart "; if (is_msdos(partition_table)) cmd_line += "primary "; @@ -1518,10 +1530,12 @@ const Partition* partition_rhs = to_partition(action->get_device(commit_data.actiongraph, RHS)); const Partitionable* partitionable = get_partitionable(); - // Note: --ignore-busy is not available in upstream parted (2021-07-26). + string cmd_line = PARTED_BIN " --script "; + + if (PartedVersion::supports_ignore_busy()) + cmd_line += "--ignore-busy "; - string cmd_line = PARTED_BIN " --script --ignore-busy " + quote(partitionable->get_name()) + - " unit s resizepart " + to_string(get_number()) + " "; + cmd_line += quote(partitionable->get_name()) + " unit s resizepart " + to_string(get_number()) + " "; unsigned long long factor = parted_sector_adjustment_factor(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/storage/Devices/PartitionableImpl.cc new/libstorage-ng-4.5.46/storage/Devices/PartitionableImpl.cc --- old/libstorage-ng-4.5.45/storage/Devices/PartitionableImpl.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/storage/Devices/PartitionableImpl.cc 2022-10-14 14:50:44.000000000 +0200 @@ -335,9 +335,8 @@ string Partitionable::Impl::partition_name(int number) const { - // Note: Seems as if other distros use "p" instead of "-part". - - if (boost::starts_with(get_name(), DEV_MAPPER_DIR "/")) + if (boost::starts_with(get_name(), DEV_MAPPER_DIR "/") && + os_flavour() == OsFlavour::SUSE) return get_name() + "-part" + to_string(number); else if (isdigit(get_name().back())) return get_name() + "p" + to_string(number); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/storage/EnvironmentImpl.cc new/libstorage-ng-4.5.46/storage/EnvironmentImpl.cc --- old/libstorage-ng-4.5.45/storage/EnvironmentImpl.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/storage/EnvironmentImpl.cc 2022-10-14 14:50:44.000000000 +0200 @@ -25,6 +25,7 @@ #include <string.h> #include <ostream> +#include "config.h" #include "storage/EnvironmentImpl.h" @@ -150,6 +151,29 @@ } + const vector<string> EnumTraits<OsFlavour>::names({ + "linux", "suse", "redhat" + }); + + + OsFlavour + os_flavour() + { + const char* p = getenv("LIBSTORAGE_OS_FLAVOUR"); + + if (!p) + p = OS_FLAVOUR; + + if (strcmp(p, "suse") == 0) + return OsFlavour::SUSE; + + if (strcmp(p, "redhat") == 0) + return OsFlavour::REDHAT; + + return OsFlavour::LINUX; + } + + void Environment::Impl::extra_log() { @@ -165,6 +189,7 @@ "LIBSTORAGE_LOCKFILE_ROOT", "LIBSTORAGE_MDADM_ACTIVATE_METHOD", "LIBSTORAGE_MULTIPLE_DEVICES_BTRFS", + "LIBSTORAGE_OS_FLAVOUR", "LIBSTORAGE_PFSOEMS", "LIBSTORAGE_ROOTPREFIX", }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/storage/EnvironmentImpl.h new/libstorage-ng-4.5.46/storage/EnvironmentImpl.h --- old/libstorage-ng-4.5.45/storage/EnvironmentImpl.h 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/storage/EnvironmentImpl.h 2022-10-14 14:50:44.000000000 +0200 @@ -126,6 +126,21 @@ */ int mdadm_activate_method(); + /** + * Operating system flavour. + */ + enum class OsFlavour + { + LINUX, SUSE, REDHAT + }; + + template <> struct EnumTraits<OsFlavour> { static const vector<string> names; }; + + /** + * Get the operating system flavour. + */ + OsFlavour os_flavour(); + } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/storage/StorageImpl.cc new/libstorage-ng-4.5.46/storage/StorageImpl.cc --- old/libstorage-ng-4.5.45/storage/StorageImpl.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/storage/StorageImpl.cc 2022-10-14 14:50:44.000000000 +0200 @@ -58,6 +58,7 @@ { y2mil("constructed Storage with " << environment); y2mil("libstorage-ng version " VERSION); + y2mil("os-flavour " << toString(os_flavour())); y2mil("timestamp " << timestamp()); Environment::Impl::extra_log(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/storage/SystemInfo/CmdParted.cc new/libstorage-ng-4.5.46/storage/SystemInfo/CmdParted.cc --- old/libstorage-ng-4.5.45/storage/SystemInfo/CmdParted.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/storage/SystemInfo/CmdParted.cc 2022-10-14 14:50:44.000000000 +0200 @@ -33,6 +33,7 @@ #include "storage/Utils/StorageTypes.h" #include "storage/Devices/PartitionTable.h" #include "storage/Utils/Format.h" +#include "storage/EnvironmentImpl.h" namespace storage @@ -78,6 +79,9 @@ } parse(cmd.stdout(), cmd.stderr()); + + if (PartedVersion::print_triggers_udev()) + SystemCmd(UDEVADM_BIN_SETTLE); } @@ -702,9 +706,37 @@ { query_version(); - // For upstream with 3.6. + if (os_flavour() == OsFlavour::SUSE) + return major >= 4 || (major == 3 && minor >= 5); - return major >= 4 || (major == 3 && minor >= 5); + return major >= 4 || (major == 3 && minor >= 6); + } + + + bool + PartedVersion::supports_wipe_signatures() + { + // Option --wipesignatures is not available in upstream parted (2021-07-26). + + return os_flavour() == OsFlavour::SUSE; + } + + + bool + PartedVersion::supports_ignore_busy() + { + // Option --ignore-busy is not available in upstream parted (2021-07-26). + + return os_flavour() == OsFlavour::SUSE; + } + + + bool + PartedVersion::print_triggers_udev() + { + // SUSE has a patch to open the device read-only if only e.g. print is executed. + + return os_flavour() != OsFlavour::SUSE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/storage/SystemInfo/CmdParted.h new/libstorage-ng-4.5.46/storage/SystemInfo/CmdParted.h --- old/libstorage-ng-4.5.45/storage/SystemInfo/CmdParted.h 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/storage/SystemInfo/CmdParted.h 2022-10-14 14:50:44.000000000 +0200 @@ -219,6 +219,9 @@ static bool supports_json_option(); static bool supports_type_command(); + static bool supports_wipe_signatures(); + static bool supports_ignore_busy(); + static bool print_triggers_udev(); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/SystemInfo/parted-34.cc new/libstorage-ng-4.5.46/testsuite/SystemInfo/parted-34.cc --- old/libstorage-ng-4.5.45/testsuite/SystemInfo/parted-34.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/SystemInfo/parted-34.cc 2022-10-14 14:50:44.000000000 +0200 @@ -19,6 +19,8 @@ check(const string& device, const vector<string>& stdout, const vector<string>& stderr, const vector<string>& result) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + Mockup::set_mode(Mockup::Mode::PLAYBACK); Mockup::set_command(PARTED_BIN " --version", RemoteCommand({ "parted (GNU parted) 3.4" }, {}, 0)); Mockup::set_command(PARTED_BIN " --script --machine " + quote(device) + " unit s print", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/SystemInfo/parted-35.cc new/libstorage-ng-4.5.46/testsuite/SystemInfo/parted-35.cc --- old/libstorage-ng-4.5.45/testsuite/SystemInfo/parted-35.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/SystemInfo/parted-35.cc 2022-10-14 14:50:44.000000000 +0200 @@ -19,6 +19,8 @@ check(const string& device, const vector<string>& stdout, const vector<string>& stderr, const vector<string>& result) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + Mockup::set_mode(Mockup::Mode::PLAYBACK); Mockup::set_command(PARTED_BIN " --version", RemoteCommand({ "parted (GNU parted) 3.5" }, {}, 0)); Mockup::set_command(PARTED_BIN " --script --json " + quote(device) + " unit s print", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/dependencies/partition-tables/repair1.cc new/libstorage-ng-4.5.46/testsuite/dependencies/partition-tables/repair1.cc --- old/libstorage-ng-4.5.45/testsuite/dependencies/partition-tables/repair1.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/dependencies/partition-tables/repair1.cc 2022-10-14 14:50:44.000000000 +0200 @@ -13,6 +13,8 @@ BOOST_AUTO_TEST_CASE(dependencies) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + set_logger(get_stdout_logger()); TsCmpActiongraph cmp("repair1", true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/dependencies/partitions/dasd1.cc new/libstorage-ng-4.5.46/testsuite/dependencies/partitions/dasd1.cc --- old/libstorage-ng-4.5.45/testsuite/dependencies/partitions/dasd1.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/dependencies/partitions/dasd1.cc 2022-10-14 14:50:44.000000000 +0200 @@ -16,6 +16,8 @@ BOOST_AUTO_TEST_CASE(actions) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + set_logger(get_stdout_logger()); TsCmpActiongraph cmp("dasd1", true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/dependencies/resize/btrfs/grow-multi1.cc new/libstorage-ng-4.5.46/testsuite/dependencies/resize/btrfs/grow-multi1.cc --- old/libstorage-ng-4.5.45/testsuite/dependencies/resize/btrfs/grow-multi1.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/dependencies/resize/btrfs/grow-multi1.cc 2022-10-14 14:50:44.000000000 +0200 @@ -15,6 +15,8 @@ BOOST_AUTO_TEST_CASE(actions) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + set_logger(get_stdout_logger()); TsCmpActiongraph cmp("grow-multi1", true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/dependencies/resize/btrfs/grow1.cc new/libstorage-ng-4.5.46/testsuite/dependencies/resize/btrfs/grow1.cc --- old/libstorage-ng-4.5.45/testsuite/dependencies/resize/btrfs/grow1.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/dependencies/resize/btrfs/grow1.cc 2022-10-14 14:50:44.000000000 +0200 @@ -15,6 +15,8 @@ BOOST_AUTO_TEST_CASE(actions) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + set_logger(get_stdout_logger()); TsCmpActiongraph cmp("grow1", true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/dependencies/resize/btrfs/shrink-multi1.cc new/libstorage-ng-4.5.46/testsuite/dependencies/resize/btrfs/shrink-multi1.cc --- old/libstorage-ng-4.5.45/testsuite/dependencies/resize/btrfs/shrink-multi1.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/dependencies/resize/btrfs/shrink-multi1.cc 2022-10-14 14:50:44.000000000 +0200 @@ -16,6 +16,8 @@ BOOST_AUTO_TEST_CASE(actions) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + set_logger(get_stdout_logger()); TsCmpActiongraph cmp("shrink-multi1", true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/dependencies/resize/btrfs/shrink1.cc new/libstorage-ng-4.5.46/testsuite/dependencies/resize/btrfs/shrink1.cc --- old/libstorage-ng-4.5.45/testsuite/dependencies/resize/btrfs/shrink1.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/dependencies/resize/btrfs/shrink1.cc 2022-10-14 14:50:44.000000000 +0200 @@ -16,6 +16,8 @@ BOOST_AUTO_TEST_CASE(actions) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + set_logger(get_stdout_logger()); TsCmpActiongraph cmp("shrink1", true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/dependencies/resize/ext4/grow1.cc new/libstorage-ng-4.5.46/testsuite/dependencies/resize/ext4/grow1.cc --- old/libstorage-ng-4.5.45/testsuite/dependencies/resize/ext4/grow1.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/dependencies/resize/ext4/grow1.cc 2022-10-14 14:50:44.000000000 +0200 @@ -15,6 +15,8 @@ BOOST_AUTO_TEST_CASE(actions) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + set_logger(get_stdout_logger()); TsCmpActiongraph cmp("grow1", true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/dependencies/resize/ext4/grow2.cc new/libstorage-ng-4.5.46/testsuite/dependencies/resize/ext4/grow2.cc --- old/libstorage-ng-4.5.45/testsuite/dependencies/resize/ext4/grow2.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/dependencies/resize/ext4/grow2.cc 2022-10-14 14:50:44.000000000 +0200 @@ -15,6 +15,8 @@ BOOST_AUTO_TEST_CASE(actions) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + set_logger(get_stdout_logger()); TsCmpActiongraph cmp("grow2", true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/dependencies/resize/ext4/shrink1.cc new/libstorage-ng-4.5.46/testsuite/dependencies/resize/ext4/shrink1.cc --- old/libstorage-ng-4.5.45/testsuite/dependencies/resize/ext4/shrink1.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/dependencies/resize/ext4/shrink1.cc 2022-10-14 14:50:44.000000000 +0200 @@ -15,6 +15,8 @@ BOOST_AUTO_TEST_CASE(actions) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + set_logger(get_stdout_logger()); TsCmpActiongraph cmp("shrink1", true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/dependencies/resize/ext4/shrink2.cc new/libstorage-ng-4.5.46/testsuite/dependencies/resize/ext4/shrink2.cc --- old/libstorage-ng-4.5.45/testsuite/dependencies/resize/ext4/shrink2.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/dependencies/resize/ext4/shrink2.cc 2022-10-14 14:50:44.000000000 +0200 @@ -15,6 +15,8 @@ BOOST_AUTO_TEST_CASE(actions) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + set_logger(get_stdout_logger()); TsCmpActiongraph cmp("shrink2", true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/partitions/names.cc new/libstorage-ng-4.5.46/testsuite/partitions/names.cc --- old/libstorage-ng-4.5.45/testsuite/partitions/names.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/partitions/names.cc 2022-10-14 14:50:44.000000000 +0200 @@ -69,6 +69,8 @@ BOOST_AUTO_TEST_CASE(test_multipath1) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + set_logger(get_stdout_logger()); Environment environment(true, ProbeMode::NONE, TargetMode::DIRECT); @@ -85,6 +87,8 @@ BOOST_AUTO_TEST_CASE(test_multipath2) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + set_logger(get_stdout_logger()); Environment environment(true, ProbeMode::NONE, TargetMode::DIRECT); @@ -97,3 +101,39 @@ BOOST_CHECK_EQUAL(multipath->get_impl().partition_name(1), "/dev/mapper/some-alias-part1"); } + + +BOOST_AUTO_TEST_CASE(test_multipath3_suse) +{ + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + + set_logger(get_stdout_logger()); + + Environment environment(true, ProbeMode::NONE, TargetMode::DIRECT); + + Storage storage(environment); + + Devicegraph* devicegraph = storage.get_staging(); + + Multipath* multipath = Multipath::create(devicegraph, "/dev/mapper/mpathb", Region(0, 1000000, 512)); + + BOOST_CHECK_EQUAL(multipath->get_impl().partition_name(1), "/dev/mapper/mpathb-part1"); +} + + +BOOST_AUTO_TEST_CASE(test_multipath3_fedora) +{ + setenv("LIBSTORAGE_OS_FLAVOUR", "redhat", 1); + + set_logger(get_stdout_logger()); + + Environment environment(true, ProbeMode::NONE, TargetMode::DIRECT); + + Storage storage(environment); + + Devicegraph* devicegraph = storage.get_staging(); + + Multipath* multipath = Multipath::create(devicegraph, "/dev/mapper/mpathb", Region(0, 1000000, 512)); + + BOOST_CHECK_EQUAL(multipath->get_impl().partition_name(1), "/dev/mapper/mpathb1"); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.45/testsuite/probe/dmraid1.cc new/libstorage-ng-4.5.46/testsuite/probe/dmraid1.cc --- old/libstorage-ng-4.5.45/testsuite/probe/dmraid1.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/probe/dmraid1.cc 2022-10-14 14:50:44.000000000 +0200 @@ -18,6 +18,8 @@ BOOST_AUTO_TEST_CASE(probe) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 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.5.45/testsuite/probe/multipath+luks1.cc new/libstorage-ng-4.5.46/testsuite/probe/multipath+luks1.cc --- old/libstorage-ng-4.5.45/testsuite/probe/multipath+luks1.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/probe/multipath+luks1.cc 2022-10-14 14:50:44.000000000 +0200 @@ -18,6 +18,8 @@ BOOST_AUTO_TEST_CASE(probe) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 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.5.45/testsuite/probe/multipath1.cc new/libstorage-ng-4.5.46/testsuite/probe/multipath1.cc --- old/libstorage-ng-4.5.45/testsuite/probe/multipath1.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/probe/multipath1.cc 2022-10-14 14:50:44.000000000 +0200 @@ -18,6 +18,8 @@ BOOST_AUTO_TEST_CASE(probe) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 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.5.45/testsuite/set-source.cc new/libstorage-ng-4.5.46/testsuite/set-source.cc --- old/libstorage-ng-4.5.45/testsuite/set-source.cc 2022-09-13 15:34:04.000000000 +0200 +++ new/libstorage-ng-4.5.46/testsuite/set-source.cc 2022-10-14 14:50:44.000000000 +0200 @@ -66,6 +66,8 @@ BOOST_AUTO_TEST_CASE(test2) { + setenv("LIBSTORAGE_OS_FLAVOUR", "suse", 1); + Environment environment(true, ProbeMode::NONE, TargetMode::DIRECT); Storage storage(environment);
