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-08-04 22:28:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng" Wed Aug 4 22:28:43 2021 rev:125 rq:910176 version:4.4.32 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2021-07-29 21:31:30.276805007 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.1899/libstorage-ng.changes 2021-08-04 22:29:21.217767678 +0200 @@ -1,0 +2,14 @@ +Wed Aug 4 16:14:17 UTC 2021 - aschn...@suse.com + +- merge gh#openSUSE/libstorage-ng#826 +- allow to attach userdata to pools +- 4.4.32 + +-------------------------------------------------------------------- +Fri Jul 30 17:18:45 UTC 2021 - aschn...@suse.com + +- merge gh#openSUSE/libstorage-ng#825 +- run blkdiscard when creating/removing partition tables and partitions +- 4.4.31 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-4.4.30.tar.xz New: ---- libstorage-ng-4.4.32.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.MZeeJ5/_old 2021-08-04 22:29:21.765767010 +0200 +++ /var/tmp/diff_new_pack.MZeeJ5/_new 2021-08-04 22:29:21.769767005 +0200 @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 4.4.30 +Version: 4.4.32 Release: 0 Summary: Library for storage management License: GPL-2.0-only ++++++ libstorage-ng-4.4.30.tar.xz -> libstorage-ng-4.4.32.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/LIBVERSION new/libstorage-ng-4.4.32/LIBVERSION --- old/libstorage-ng-4.4.30/LIBVERSION 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/LIBVERSION 2021-08-04 18:14:17.000000000 +0200 @@ -1 +1 @@ -1.58.1 +1.59.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/VERSION new/libstorage-ng-4.4.32/VERSION --- old/libstorage-ng-4.4.30/VERSION 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/VERSION 2021-08-04 18:14:17.000000000 +0200 @@ -1 +1 @@ -4.4.30 +4.4.32 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/doc/discard.md new/libstorage-ng-4.4.32/doc/discard.md --- old/libstorage-ng-4.4.30/doc/discard.md 1970-01-01 01:00:00.000000000 +0100 +++ new/libstorage-ng-4.4.32/doc/discard.md 2021-08-04 18:14:17.000000000 +0200 @@ -0,0 +1,12 @@ + +Discard +------- + +libstorage-ng does calls to blkdiscard e.g. before creating a +partition table and after creating a partition. + +In general that should not have a huge advantage since most several +file systems do discard on their own during mkfs (e.g. ext4 and xfs) +or fstrim will do so. But if areas are left unpartitioned it should +be beneficial. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/Devices/BlkDeviceImpl.cc new/libstorage-ng-4.4.32/storage/Devices/BlkDeviceImpl.cc --- old/libstorage-ng-4.4.30/storage/Devices/BlkDeviceImpl.cc 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/Devices/BlkDeviceImpl.cc 2021-08-04 18:14:17.000000000 +0200 @@ -879,6 +879,15 @@ } + void + BlkDevice::Impl::discard_device() const + { + string cmd_line = BLKDISCARD_BIN " " + quote(get_name()); + + SystemCmd cmd(cmd_line, SystemCmd::NoThrow); + } + + bool BlkDevice::Impl::is_valid_name(const string& name) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/Devices/BlkDeviceImpl.h new/libstorage-ng-4.4.32/storage/Devices/BlkDeviceImpl.h --- old/libstorage-ng-4.4.30/storage/Devices/BlkDeviceImpl.h 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/Devices/BlkDeviceImpl.h 2021-08-04 18:14:17.000000000 +0200 @@ -180,6 +180,7 @@ virtual void process_udev_ids(vector<string>& udev_ids) const { udev_ids.clear(); } void wipe_device() const; + void discard_device() const; static bool is_valid_name(const string& name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/Devices/DasdPtImpl.cc new/libstorage-ng-4.4.32/storage/Devices/DasdPtImpl.cc --- old/libstorage-ng-4.4.30/storage/Devices/DasdPtImpl.cc 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/Devices/DasdPtImpl.cc 2021-08-04 18:14:17.000000000 +0200 @@ -23,7 +23,7 @@ #include "storage/Utils/HumanString.h" #include "storage/Devices/DasdPtImpl.h" -#include "storage/Devices/Partitionable.h" +#include "storage/Devices/PartitionableImpl.h" #include "storage/Devices/PartitionImpl.h" #include "storage/Devicegraph.h" #include "storage/Utils/StorageTmpl.h" @@ -226,6 +226,8 @@ { const Partitionable* partitionable = get_partitionable(); + partitionable->get_impl().discard_device(); + string cmd_line = PARTED_BIN " --script " + quote(partitionable->get_name()) + " mklabel dasd"; SystemCmd cmd(cmd_line, SystemCmd::DoThrow); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/Devices/GptImpl.cc new/libstorage-ng-4.4.32/storage/Devices/GptImpl.cc --- old/libstorage-ng-4.4.30/storage/Devices/GptImpl.cc 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/Devices/GptImpl.cc 2021-08-04 18:14:17.000000000 +0200 @@ -23,7 +23,7 @@ #include "storage/Utils/HumanString.h" #include "storage/Devices/GptImpl.h" -#include "storage/Devices/Partitionable.h" +#include "storage/Devices/PartitionableImpl.h" #include "storage/Devicegraph.h" #include "storage/Action.h" #include "storage/Utils/StorageTmpl.h" @@ -248,6 +248,8 @@ { const Partitionable* partitionable = get_partitionable(); + partitionable->get_impl().discard_device(); + string cmd_line = PARTED_BIN " --script " + quote(partitionable->get_name()) + " mklabel gpt"; SystemCmd cmd(cmd_line, SystemCmd::DoThrow); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/Devices/MsdosImpl.cc new/libstorage-ng-4.4.32/storage/Devices/MsdosImpl.cc --- old/libstorage-ng-4.4.30/storage/Devices/MsdosImpl.cc 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/Devices/MsdosImpl.cc 2021-08-04 18:14:17.000000000 +0200 @@ -300,6 +300,8 @@ { const Partitionable* partitionable = get_partitionable(); + partitionable->get_impl().discard_device(); + string cmd_line = PARTED_BIN " --script " + quote(partitionable->get_name()) + " mklabel msdos"; SystemCmd cmd(cmd_line, SystemCmd::DoThrow); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/Devices/PartitionImpl.cc new/libstorage-ng-4.4.32/storage/Devices/PartitionImpl.cc --- old/libstorage-ng-4.4.30/storage/Devices/PartitionImpl.cc 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/Devices/PartitionImpl.cc 2021-08-04 18:14:17.000000000 +0200 @@ -819,6 +819,8 @@ SystemCmd(UDEVADM_BIN_SETTLE); SystemCmd cmd(cmd_line, SystemCmd::DoThrow); + + discard_device(); } @@ -1124,6 +1126,8 @@ { do_delete_efi_boot_mgr(); + discard_device(); + const Partitionable* partitionable = get_partitionable(); string cmd_line = PARTED_BIN " --script " + quote(partitionable->get_name()) + " rm " + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/Devices/PartitionTableImpl.cc new/libstorage-ng-4.4.32/storage/Devices/PartitionTableImpl.cc --- old/libstorage-ng-4.4.30/storage/Devices/PartitionTableImpl.cc 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/Devices/PartitionTableImpl.cc 2021-08-04 18:14:17.000000000 +0200 @@ -644,6 +644,8 @@ // https://bugzilla.suse.com/show_bug.cgi?id=896485 partitionable->get_impl().wipe_device(); + + partitionable->get_impl().discard_device(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/Pool.cc new/libstorage-ng-4.4.32/storage/Pool.cc --- old/libstorage-ng-4.4.30/storage/Pool.cc 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/Pool.cc 2021-08-04 18:14:17.000000000 +0200 @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 Arvin Schnell + * Copyright (c) 2021 SUSE LLC * * All Rights Reserved. * @@ -46,6 +47,20 @@ } + const map<string, string>& + Pool::get_userdata() const + { + return get_impl().get_userdata(); + } + + + void + Pool::set_userdata(const map<string, string>& userdata) + { + get_impl().set_userdata(userdata); + } + + size_t Pool::size(const Devicegraph* devicegraph) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/Pool.h new/libstorage-ng-4.4.32/storage/Pool.h --- old/libstorage-ng-4.4.30/storage/Pool.h 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/Pool.h 2021-08-04 18:14:17.000000000 +0200 @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 Arvin Schnell + * Copyright (c) 2021 SUSE LLC * * All Rights Reserved. * @@ -25,6 +26,7 @@ #include <vector> +#include <map> #include <memory> #include <boost/noncopyable.hpp> @@ -85,6 +87,16 @@ ~Pool(); /** + * Return the userdata of the pool. + */ + const std::map<std::string, std::string>& get_userdata() const; + + /** + * Set the userdata of the pool. + */ + void set_userdata(const std::map<std::string, std::string>& userdata); + + /** * Add a device to the pool. The devicegraph the device belongs to is irrelevant. * * @see remove_device(const Device*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/PoolImpl.h new/libstorage-ng-4.4.32/storage/PoolImpl.h --- old/libstorage-ng-4.4.30/storage/PoolImpl.h 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/PoolImpl.h 2021-08-04 18:14:17.000000000 +0200 @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 Arvin Schnell + * Copyright (c) 2021 SUSE LLC * * All Rights Reserved. * @@ -24,8 +25,6 @@ #define STORAGE_POOL_IMPL_H -#include <vector> - #include "storage/Pool.h" #include "storage/Devices/Device.h" @@ -34,6 +33,7 @@ { using std::string; using std::vector; + using std::map; class Partitionable; @@ -43,7 +43,10 @@ public: - void add_device(const Device* device); + const map<string, string>& get_userdata() const { return userdata; } + void set_userdata(const map<string, string>& userdata) { Impl::userdata = userdata; } + + void add_device(const Device* device); void remove_device(const Device* device); size_t size(const Devicegraph* devicegraph) const; @@ -68,6 +71,8 @@ private: + map<string, string> userdata; + vector<sid_t> devices; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/Storage.cc new/libstorage-ng-4.4.32/storage/Storage.cc --- old/libstorage-ng-4.4.30/storage/Storage.cc 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/Storage.cc 2021-08-04 18:14:17.000000000 +0200 @@ -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. * @@ -313,6 +313,13 @@ } + map<string, Pool*> + Storage::get_pools() + { + return get_impl().get_pools(); + } + + map<string, const Pool*> Storage::get_pools() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/Storage.h new/libstorage-ng-4.4.32/storage/Storage.h --- old/libstorage-ng-4.4.30/storage/Storage.h 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/Storage.h 2021-08-04 18:14:17.000000000 +0200 @@ -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. * @@ -477,7 +477,8 @@ /** * Generate pools, e.g. "HDDs (512 B)" for HDDs with 512 B sector size and "SSDs - * (4 KiB)" for SSDs with 4 KiB sector size. + * (4 KiB)" for SSDs with 4 KiB sector size. The pools generated and their names + * may change anytime. */ void generate_pools(const Devicegraph* devicegraph); @@ -508,6 +509,11 @@ /** * Get all pools with their names. */ + std::map<std::string, Pool*> get_pools(); + + /** + * @copydoc get_pools() + */ std::map<std::string, const Pool*> get_pools() const; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/StorageImpl.cc new/libstorage-ng-4.4.32/storage/StorageImpl.cc --- old/libstorage-ng-4.4.30/storage/StorageImpl.cc 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/StorageImpl.cc 2021-08-04 18:14:17.000000000 +0200 @@ -554,6 +554,18 @@ } + map<string, Pool*> + Storage::Impl::get_pools() + { + map<string, Pool*> ret; + + for (pools_t::value_type& tmp : pools) + ret[tmp.first] = &tmp.second; + + return ret; + } + + map<string, const Pool*> Storage::Impl::get_pools() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/StorageImpl.h new/libstorage-ng-4.4.32/storage/StorageImpl.h --- old/libstorage-ng-4.4.30/storage/StorageImpl.h 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/StorageImpl.h 2021-08-04 18:14:17.000000000 +0200 @@ -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. * @@ -120,6 +120,8 @@ bool exists_pool(const string& name) const; vector<string> get_pool_names() const; + + map<string, Pool*> get_pools(); map<string, const Pool*> get_pools() const; Pool* get_pool(const string& name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/storage/Utils/StorageDefines.h new/libstorage-ng-4.4.32/storage/Utils/StorageDefines.h --- old/libstorage-ng-4.4.30/storage/Utils/StorageDefines.h 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/storage/Utils/StorageDefines.h 2021-08-04 18:14:17.000000000 +0200 @@ -88,6 +88,7 @@ #define DMRAID_BIN "/sbin/dmraid" #define BTRFS_BIN "/sbin/btrfs" #define WIPEFS_BIN "/sbin/wipefs" +#define BLKDISCARD_BIN "/usr/sbin/blkdiscard" #define BCACHE_BIN "/usr/sbin/bcache" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/testsuite/dependencies/partition-tables/delete1-mockup.xml new/libstorage-ng-4.4.32/testsuite/dependencies/partition-tables/delete1-mockup.xml --- old/libstorage-ng-4.4.30/testsuite/dependencies/partition-tables/delete1-mockup.xml 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/testsuite/dependencies/partition-tables/delete1-mockup.xml 2021-08-04 18:14:17.000000000 +0200 @@ -14,18 +14,34 @@ <!-- stdout missing --> </Command> <Command> + <name>/usr/sbin/blkdiscard '/dev/sda4'</name> + <!-- stdout missing --> + </Command> + <Command> <name>/usr/sbin/parted --script '/dev/sda' rm 4</name> <!-- stdout missing --> </Command> <Command> + <name>/usr/sbin/blkdiscard '/dev/sda3'</name> + <!-- stdout missing --> + </Command> + <Command> <name>/usr/sbin/parted --script '/dev/sda' rm 3</name> <!-- stdout missing --> </Command> <Command> + <name>/usr/sbin/blkdiscard '/dev/sda2'</name> + <!-- stdout missing --> + </Command> + <Command> <name>/usr/sbin/parted --script '/dev/sda' rm 2</name> <!-- stdout missing --> </Command> <Command> + <name>/usr/sbin/blkdiscard '/dev/sda1'</name> + <!-- stdout missing --> + </Command> + <Command> <name>/usr/sbin/parted --script '/dev/sda' rm 1</name> <!-- stdout missing --> </Command> @@ -33,5 +49,9 @@ <name>/sbin/wipefs --all '/dev/sda'</name> <!-- stdout missing --> </Command> + <Command> + <name>/usr/sbin/blkdiscard '/dev/sda'</name> + <!-- stdout missing --> + </Command> </Commands> </Mockup> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/testsuite/dependencies/partition-tables/repair1-mockup.xml new/libstorage-ng-4.4.32/testsuite/dependencies/partition-tables/repair1-mockup.xml --- old/libstorage-ng-4.4.30/testsuite/dependencies/partition-tables/repair1-mockup.xml 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/testsuite/dependencies/partition-tables/repair1-mockup.xml 2021-08-04 18:14:17.000000000 +0200 @@ -13,6 +13,10 @@ <!-- stdout missing --> </Command> <Command> + <name>/usr/sbin/blkdiscard '/dev/sdb1'</name> + <!-- stdout missing --> + </Command> + <Command> <name>/usr/sbin/parted --script '/dev/sdb' unit s print</name> <!-- stdout missing --> </Command> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/testsuite/dependencies/partitions/dasd1-mockup.xml new/libstorage-ng-4.4.32/testsuite/dependencies/partitions/dasd1-mockup.xml --- old/libstorage-ng-4.4.30/testsuite/dependencies/partitions/dasd1-mockup.xml 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/testsuite/dependencies/partitions/dasd1-mockup.xml 2021-08-04 18:14:17.000000000 +0200 @@ -14,7 +14,13 @@ <name>/usr/sbin/parted --script --wipesignatures '/dev/dasda' unit s mkpart ext2 192 409727</name> </Command> <Command> + <name>/usr/sbin/blkdiscard '/dev/dasda1'</name> + </Command> + <Command> <name>/usr/sbin/parted --script --wipesignatures '/dev/vda' unit s mkpart ext2 24 51215</name> </Command> + <Command> + <name>/usr/sbin/blkdiscard '/dev/vda1'</name> + </Command> </Commands> </Mockup> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/testsuite/dependencies/resize/ext4/grow2-mockup.xml new/libstorage-ng-4.4.32/testsuite/dependencies/resize/ext4/grow2-mockup.xml --- old/libstorage-ng-4.4.30/testsuite/dependencies/resize/ext4/grow2-mockup.xml 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/testsuite/dependencies/resize/ext4/grow2-mockup.xml 2021-08-04 18:14:17.000000000 +0200 @@ -5,6 +5,10 @@ <name>/usr/bin/udevadm settle --timeout=20</name> </Command> <Command> + <name>/usr/sbin/blkdiscard '/dev/sdc5'</name> + <!-- stdout missing --> + </Command> + <Command> <name>/usr/sbin/parted --script '/dev/sdc' rm 5</name> <!-- stdout missing --> </Command> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.4.30/testsuite/dependencies/resize/ext4/shrink2-mockup.xml new/libstorage-ng-4.4.32/testsuite/dependencies/resize/ext4/shrink2-mockup.xml --- old/libstorage-ng-4.4.30/testsuite/dependencies/resize/ext4/shrink2-mockup.xml 2021-07-26 10:28:18.000000000 +0200 +++ new/libstorage-ng-4.4.32/testsuite/dependencies/resize/ext4/shrink2-mockup.xml 2021-08-04 18:14:17.000000000 +0200 @@ -13,6 +13,10 @@ <!-- stdout missing --> </Command> <Command> + <name>/usr/sbin/blkdiscard '/dev/sdc5'</name> + <!-- stdout missing --> + </Command> + <Command> <name>/usr/sbin/parted --script '/dev/sdc' rm 5</name> <!-- stdout missing --> </Command>