Hello community, here is the log from the commit of package libstorage-ng for openSUSE:Factory checked in at 2020-12-09 22:11:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng" Wed Dec 9 22:11:19 2020 rev:100 rq:853551 version:4.3.72 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2020-11-13 18:57:31.830010315 +0100 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.2328/libstorage-ng.changes 2020-12-09 22:11:23.803065542 +0100 @@ -1,0 +2,7 @@ +Mon Dec 7 09:31:47 UTC 2020 - aschn...@suse.com + +- merge gh#openSUSE/libstorage-ng#785 +- handle missing partition device nodes for multipath (bsc#1175981) +- 4.3.72 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-4.3.71.tar.xz New: ---- libstorage-ng-4.3.72.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.UoOeX6/_old 2020-12-09 22:11:24.343066089 +0100 +++ /var/tmp/diff_new_pack.UoOeX6/_new 2020-12-09 22:11:24.347066094 +0100 @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 4.3.71 +Version: 4.3.72 Release: 0 Summary: Library for storage management License: GPL-2.0-only ++++++ libstorage-ng-4.3.71.tar.xz -> libstorage-ng-4.3.72.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.3.71/VERSION new/libstorage-ng-4.3.72/VERSION --- old/libstorage-ng-4.3.71/VERSION 2020-11-12 17:14:56.000000000 +0100 +++ new/libstorage-ng-4.3.72/VERSION 2020-12-07 10:31:47.000000000 +0100 @@ -1 +1 @@ -4.3.71 +4.3.72 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.3.71/storage/Devices/BlkDeviceImpl.h new/libstorage-ng-4.3.72/storage/Devices/BlkDeviceImpl.h --- old/libstorage-ng-4.3.71/storage/Devices/BlkDeviceImpl.h 2020-11-12 17:14:56.000000000 +0100 +++ new/libstorage-ng-4.3.72/storage/Devices/BlkDeviceImpl.h 2020-12-07 10:31:47.000000000 +0100 @@ -61,7 +61,7 @@ virtual void check(const CheckCallbacks* check_callbacks) const override; - virtual bool is_usable_as_blk_device() const { return true; } + virtual bool is_usable_as_blk_device() const { return active; } const string& get_name() const { return name; } void set_name(const string& name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.3.71/storage/Devices/PartitionImpl.cc new/libstorage-ng-4.3.72/storage/Devices/PartitionImpl.cc --- old/libstorage-ng-4.3.71/storage/Devices/PartitionImpl.cc 2020-11-12 17:14:56.000000000 +0100 +++ new/libstorage-ng-4.3.72/storage/Devices/PartitionImpl.cc 2020-12-07 10:31:47.000000000 +0100 @@ -123,6 +123,9 @@ boot = entry.boot; legacy_boot = entry.legacy_boot; + if (!is_active()) + return; + const CmdUdevadmInfo& cmd_udevadm_info = system_info.getCmdUdevadmInfo(get_name()); if (!cmd_udevadm_info.get_by_part_label_links().empty()) @@ -176,6 +179,9 @@ bool Partition::Impl::is_usable_as_blk_device() const { + if (!BlkDevice::Impl::is_usable_as_blk_device()) + return false; + return type == PartitionType::PRIMARY || type == PartitionType::LOGICAL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.3.71/storage/Devices/PartitionTableImpl.cc new/libstorage-ng-4.3.72/storage/Devices/PartitionTableImpl.cc --- old/libstorage-ng-4.3.71/storage/Devices/PartitionTableImpl.cc 2020-11-12 17:14:56.000000000 +0100 +++ new/libstorage-ng-4.3.72/storage/Devices/PartitionTableImpl.cc 2020-12-07 10:31:47.000000000 +0100 @@ -28,6 +28,7 @@ #include "storage/Devices/PartitionImpl.h" #include "storage/Devices/MsdosImpl.h" #include "storage/Devices/GptImpl.h" +#include "storage/Devices/Multipath.h" #include "storage/Holders/Subdevice.h" #include "storage/Devicegraph.h" #include "storage/SystemInfo/SystemInfo.h" @@ -74,6 +75,15 @@ string name = partitionable->get_impl().partition_name(entry.number); Partition* partition = create_partition(name, entry.region, entry.type); + + // For multipath the user can disable creation of device nodes for the + // partitions by setting skip_kpartx. See bsc #1175981 for details. + if (is_multipath(get_partitionable())) + { + const CmdStat& cmd_stat = prober.get_system_info().getCmdStat(partition->get_name()); + partition->get_impl().set_active(cmd_stat.is_blk() || cmd_stat.is_lnk()); + } + partition->get_impl().probe_pass_1a(prober); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.3.71/storage/SystemInfo/CmdStat.h new/libstorage-ng-4.3.72/storage/SystemInfo/CmdStat.h --- old/libstorage-ng-4.3.71/storage/SystemInfo/CmdStat.h 2020-11-12 17:14:56.000000000 +0100 +++ new/libstorage-ng-4.3.72/storage/SystemInfo/CmdStat.h 2020-12-07 10:31:47.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 SUSE LLC + * Copyright (c) [2018-2020] SUSE LLC * * All Rights Reserved. * @@ -47,6 +47,7 @@ bool is_blk() const { return S_ISBLK(mode); } bool is_dir() const { return S_ISDIR(mode); } bool is_reg() const { return S_ISREG(mode); } + bool is_lnk() const { return S_ISLNK(mode); } friend std::ostream& operator<<(std::ostream& s, const CmdStat& cmd_stat); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.3.71/testsuite/probe/multipath+luks1-mockup.xml new/libstorage-ng-4.3.72/testsuite/probe/multipath+luks1-mockup.xml --- old/libstorage-ng-4.3.71/testsuite/probe/multipath+luks1-mockup.xml 2020-11-12 17:14:56.000000000 +0100 +++ new/libstorage-ng-4.3.72/testsuite/probe/multipath+luks1-mockup.xml 2020-12-07 10:31:47.000000000 +0100 @@ -678,6 +678,10 @@ <stdout>61b0</stdout> </Command> <Command> + <name>/usr/bin/stat --format '%f' '/dev/mapper/36005076305ffc73a00000000000013b4-part1'</name> + <stdout>a1ff</stdout> + </Command> + <Command> <name>/usr/bin/test -d '/sys/firmware/efi/vars'</name> <exit-code>1</exit-code> </Command> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.3.71/testsuite/probe/multipath1-mockup.xml new/libstorage-ng-4.3.72/testsuite/probe/multipath1-mockup.xml --- old/libstorage-ng-4.3.71/testsuite/probe/multipath1-mockup.xml 2020-11-12 17:14:56.000000000 +0100 +++ new/libstorage-ng-4.3.72/testsuite/probe/multipath1-mockup.xml 2020-12-07 10:31:47.000000000 +0100 @@ -636,6 +636,10 @@ <stdout>61b0</stdout> </Command> <Command> + <name>/usr/bin/stat --format '%f' '/dev/mapper/36005076305ffc73a00000000000013b4-part1'</name> + <stdout>a1ff</stdout> + </Command> + <Command> <name>/usr/bin/test -d '/sys/firmware/efi/vars'</name> <exit-code>1</exit-code> </Command> _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org