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 2023-01-14 20:30:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng" Sat Jan 14 20:30:37 2023 rev:195 rq:1057780 version:4.5.63 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2023-01-08 21:25:18.223163057 +0100 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.32243/libstorage-ng.changes 2023-01-14 20:30:42.808856997 +0100 @@ -1,0 +2,8 @@ +Wed Jan 11 12:42:15 UTC 2023 - aschn...@suse.com + +- merge gh#openSUSE/libstorage-ng#911 +- avoid using existing mount paths in testsuite +- coding style +- 4.5.63 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-4.5.62.tar.xz New: ---- libstorage-ng-4.5.63.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.1fndEb/_old 2023-01-14 20:30:44.748868455 +0100 +++ /var/tmp/diff_new_pack.1fndEb/_new 2023-01-14 20:30:44.752868478 +0100 @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 4.5.62 +Version: 4.5.63 Release: 0 Summary: Library for storage management License: GPL-2.0-only ++++++ libstorage-ng-4.5.62.tar.xz -> libstorage-ng-4.5.63.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/VERSION new/libstorage-ng-4.5.63/VERSION --- old/libstorage-ng-4.5.62/VERSION 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/VERSION 2023-01-11 13:42:15.000000000 +0100 @@ -1 +1 @@ -4.5.62 +4.5.63 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/examples/compound_actions.cc new/libstorage-ng-4.5.63/examples/compound_actions.cc --- old/libstorage-ng-4.5.62/examples/compound_actions.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/examples/compound_actions.cc 2023-01-11 13:42:15.000000000 +0100 @@ -43,19 +43,19 @@ cout << "Number of commit actions:" << actiongraph->get_commit_actions().size() << endl; - for(auto text : actiongraph->get_commit_actions_as_strings()) + for (const string& text : actiongraph->get_commit_actions_as_strings()) cout << text << endl; - auto compound_actions = actiongraph->get_compound_actions(); + const vector<const CompoundAction*> compound_actions = actiongraph->get_compound_actions(); cout << "Number of compound actions:" << compound_actions.size() << endl; - for (auto& compound_action : compound_actions) + for (const CompoundAction* compound_action : compound_actions) { cout << "--> Compound action (" << compound_action->get_impl().get_commit_actions().size() << ")" << endl; cout << compound_action->sentence() << endl; } - + return EXIT_SUCCESS; } catch (const exception& e) @@ -65,4 +65,3 @@ return EXIT_FAILURE; } } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/Devices/DasdImpl.cc new/libstorage-ng-4.5.63/storage/Devices/DasdImpl.cc --- old/libstorage-ng-4.5.62/storage/Devices/DasdImpl.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/Devices/DasdImpl.cc 2023-01-11 13:42:15.000000000 +0100 @@ -21,6 +21,8 @@ */ +#include <boost/algorithm/string.hpp> + #include "storage/Devices/DasdImpl.h" #include "storage/Devicegraph.h" #include "storage/Storage.h" @@ -28,7 +30,6 @@ #include "storage/SystemInfo/SystemInfoImpl.h" #include "storage/Utils/Exception.h" #include "storage/Utils/Enum.h" -#include "storage/Utils/StorageTypes.h" #include "storage/Utils/StorageDefines.h" #include "storage/Utils/XmlFile.h" #include "storage/Utils/HumanString.h" @@ -37,6 +38,7 @@ #include "storage/Utils/AppUtil.h" #include "storage/Utils/CallbacksImpl.h" #include "storage/Utils/Format.h" +#include "storage/Utils/StorageTmpl.h" namespace storage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/Devices/DiskImpl.cc new/libstorage-ng-4.5.63/storage/Devices/DiskImpl.cc --- old/libstorage-ng-4.5.62/storage/Devices/DiskImpl.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/Devices/DiskImpl.cc 2023-01-11 13:42:15.000000000 +0100 @@ -22,6 +22,7 @@ #include <ctype.h> +#include <boost/algorithm/string.hpp> #include "storage/Devices/DiskImpl.h" #include "storage/Devicegraph.h" @@ -32,7 +33,6 @@ #include "storage/Utils/Exception.h" #include "storage/Utils/Enum.h" #include "storage/Utils/StorageTmpl.h" -#include "storage/Utils/StorageTypes.h" #include "storage/Utils/StorageDefines.h" #include "storage/Utils/XmlFile.h" #include "storage/Utils/AppUtil.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/Devices/DmRaidImpl.cc new/libstorage-ng-4.5.63/storage/Devices/DmRaidImpl.cc --- old/libstorage-ng-4.5.62/storage/Devices/DmRaidImpl.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/Devices/DmRaidImpl.cc 2023-01-11 13:42:15.000000000 +0100 @@ -20,6 +20,8 @@ */ +#include <boost/algorithm/string.hpp> + #include "storage/Devices/DmRaidImpl.h" #include "storage/Devicegraph.h" #include "storage/Storage.h" @@ -27,13 +29,11 @@ #include "storage/SystemInfo/SystemInfoImpl.h" #include "storage/Utils/Exception.h" #include "storage/Utils/StorageTmpl.h" -#include "storage/Utils/StorageTypes.h" #include "storage/Utils/StorageDefines.h" #include "storage/Utils/XmlFile.h" #include "storage/Utils/SystemCmd.h" #include "storage/UsedFeatures.h" #include "storage/Holders/User.h" -#include "storage/Utils/StorageTypes.h" namespace storage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/Devices/MdImpl.cc new/libstorage-ng-4.5.63/storage/Devices/MdImpl.cc --- old/libstorage-ng-4.5.62/storage/Devices/MdImpl.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/Devices/MdImpl.cc 2023-01-11 13:42:15.000000000 +0100 @@ -23,6 +23,7 @@ #include <ctype.h> #include <boost/integer/common_factor_rt.hpp> +#include <boost/algorithm/string.hpp> #include "storage/Devices/MdImpl.h" #include "storage/Devices/MdContainerImpl.h" @@ -38,7 +39,6 @@ #include "storage/Utils/Exception.h" #include "storage/Utils/Enum.h" #include "storage/Utils/StorageTmpl.h" -#include "storage/Utils/StorageTypes.h" #include "storage/Utils/StorageDefines.h" #include "storage/Utils/SystemCmd.h" #include "storage/Utils/StorageTmpl.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/Devices/MultipathImpl.cc new/libstorage-ng-4.5.63/storage/Devices/MultipathImpl.cc --- old/libstorage-ng-4.5.62/storage/Devices/MultipathImpl.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/Devices/MultipathImpl.cc 2023-01-11 13:42:15.000000000 +0100 @@ -20,6 +20,8 @@ */ +#include <boost/algorithm/string.hpp> + #include "storage/Devices/MultipathImpl.h" #include "storage/Devicegraph.h" #include "storage/Storage.h" @@ -27,13 +29,11 @@ #include "storage/SystemInfo/SystemInfoImpl.h" #include "storage/Utils/Exception.h" #include "storage/Utils/StorageTmpl.h" -#include "storage/Utils/StorageTypes.h" #include "storage/Utils/StorageDefines.h" #include "storage/Utils/XmlFile.h" #include "storage/Utils/SystemCmd.h" #include "storage/UsedFeatures.h" #include "storage/Holders/User.h" -#include "storage/Utils/StorageTypes.h" #include "storage/Utils/CallbacksImpl.h" #include "storage/Utils/Format.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/Filesystems/Mountable.cc new/libstorage-ng-4.5.63/storage/Filesystems/Mountable.cc --- old/libstorage-ng-4.5.62/storage/Filesystems/Mountable.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/Filesystems/Mountable.cc 2023-01-11 13:42:15.000000000 +0100 @@ -21,7 +21,6 @@ */ -#include "storage/Utils/StorageTmpl.h" #include "storage/Filesystems/MountableImpl.h" #include "storage/Devicegraph.h" #include "storage/Filesystems/MountPoint.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/Filesystems/MountableImpl.cc new/libstorage-ng-4.5.63/storage/Filesystems/MountableImpl.cc --- old/libstorage-ng-4.5.62/storage/Filesystems/MountableImpl.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/Filesystems/MountableImpl.cc 2023-01-11 13:42:15.000000000 +0100 @@ -22,7 +22,6 @@ #include <algorithm> - #include <boost/algorithm/string.hpp> #include "storage/Utils/XmlFile.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/SystemInfo/Arch.cc new/libstorage-ng-4.5.63/storage/SystemInfo/Arch.cc --- old/libstorage-ng-4.5.62/storage/SystemInfo/Arch.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/SystemInfo/Arch.cc 2023-01-11 13:42:15.000000000 +0100 @@ -25,6 +25,7 @@ #include "storage/Utils/AsciiFile.h" #include "storage/Utils/LoggerImpl.h" #include "storage/Utils/StorageTypes.h" +#include "storage/Utils/StorageTmpl.h" #include "storage/Utils/SystemCmd.h" #include "storage/Utils/StorageDefines.h" #include "storage/Utils/XmlFile.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/SystemInfo/CmdBtrfs.cc new/libstorage-ng-4.5.63/storage/SystemInfo/CmdBtrfs.cc --- old/libstorage-ng-4.5.62/storage/SystemInfo/CmdBtrfs.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/SystemInfo/CmdBtrfs.cc 2023-01-11 13:42:15.000000000 +0100 @@ -24,7 +24,7 @@ #include <locale> #include <boost/algorithm/string.hpp> -#include "storage/Utils/StorageTypes.h" +#include "storage/Utils/StorageTmpl.h" #include "storage/Utils/SystemCmd.h" #include "storage/Utils/LoggerImpl.h" #include "storage/Utils/StorageDefines.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/SystemInfo/CmdDumpe2fs.cc new/libstorage-ng-4.5.63/storage/SystemInfo/CmdDumpe2fs.cc --- old/libstorage-ng-4.5.62/storage/SystemInfo/CmdDumpe2fs.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/SystemInfo/CmdDumpe2fs.cc 2023-01-11 13:42:15.000000000 +0100 @@ -24,6 +24,7 @@ #include "storage/Utils/StorageDefines.h" #include "storage/Utils/SystemCmd.h" #include "storage/Utils/LoggerImpl.h" +#include "storage/Utils/StorageTmpl.h" #include "storage/Utils/StorageTypes.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/SystemInfo/CmdNtfsresize.cc new/libstorage-ng-4.5.63/storage/SystemInfo/CmdNtfsresize.cc --- old/libstorage-ng-4.5.62/storage/SystemInfo/CmdNtfsresize.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/SystemInfo/CmdNtfsresize.cc 2023-01-11 13:42:15.000000000 +0100 @@ -21,11 +21,14 @@ */ +#include <boost/algorithm/string.hpp> + #include "storage/SystemInfo/CmdNtfsresize.h" #include "storage/Utils/StorageDefines.h" #include "storage/Utils/SystemCmd.h" #include "storage/Utils/LoggerImpl.h" -#include "storage/Utils/StorageTypes.h" +#include "storage/Utils/StorageTmpl.h" +#include "storage/Utils/ExceptionImpl.h" namespace storage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/SystemInfo/CmdParted.cc new/libstorage-ng-4.5.63/storage/SystemInfo/CmdParted.cc --- old/libstorage-ng-4.5.62/storage/SystemInfo/CmdParted.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/SystemInfo/CmdParted.cc 2023-01-11 13:42:15.000000000 +0100 @@ -31,6 +31,7 @@ #include "storage/Utils/Enum.h" #include "storage/Devices/PartitionImpl.h" #include "storage/Utils/StorageTypes.h" +#include "storage/Utils/StorageTmpl.h" #include "storage/Devices/PartitionTable.h" #include "storage/Utils/Format.h" #include "storage/EnvironmentImpl.h" @@ -458,10 +459,10 @@ void Parted::scan_stderr(const vector<string>& stderr) { - gpt_undersized = find_if(stderr, string_contains("fix the GPT to use all")) != stderr.end(); + gpt_undersized = contains_if(stderr, string_contains("fix the GPT to use all")); - gpt_backup_broken = find_if(stderr, string_contains("backup GPT table is corrupt, but the " - "primary appears OK")) != stderr.end(); + gpt_backup_broken = contains_if(stderr, string_contains("backup GPT table is corrupt, but the " + "primary appears OK")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/SystemInfo/CmdResize2fs.cc new/libstorage-ng-4.5.63/storage/SystemInfo/CmdResize2fs.cc --- old/libstorage-ng-4.5.62/storage/SystemInfo/CmdResize2fs.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/SystemInfo/CmdResize2fs.cc 2023-01-11 13:42:15.000000000 +0100 @@ -25,6 +25,7 @@ #include "storage/Utils/SystemCmd.h" #include "storage/Utils/LoggerImpl.h" #include "storage/Utils/StorageTypes.h" +#include "storage/Utils/StorageTmpl.h" namespace storage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/Utils/AppUtil.cc new/libstorage-ng-4.5.63/storage/Utils/AppUtil.cc --- old/libstorage-ng-4.5.62/storage/Utils/AppUtil.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/Utils/AppUtil.cc 2023-01-11 13:42:15.000000000 +0100 @@ -40,7 +40,6 @@ #include "storage/Utils/StorageTmpl.h" #include "storage/Utils/StorageDefines.h" #include "storage/Utils/AppUtil.h" -#include "storage/Utils/StorageTypes.h" #include "storage/SystemInfo/SystemInfoImpl.h" #include "storage/Utils/LoggerImpl.h" #include "storage/Utils/Format.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/Utils/AsciiFile.cc new/libstorage-ng-4.5.63/storage/Utils/AsciiFile.cc --- old/libstorage-ng-4.5.62/storage/Utils/AsciiFile.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/Utils/AsciiFile.cc 2023-01-11 13:42:15.000000000 +0100 @@ -32,9 +32,9 @@ #include "storage/Utils/LoggerImpl.h" #include "storage/Utils/AsciiFile.h" #include "storage/Utils/Mockup.h" -#include "storage/Utils/StorageTypes.h" #include "storage/Utils/Format.h" #include "storage/Utils/ExceptionImpl.h" +#include "storage/Utils/AppUtil.h" namespace storage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/storage/Utils/StorageTypes.h new/libstorage-ng-4.5.63/storage/Utils/StorageTypes.h --- old/libstorage-ng-4.5.62/storage/Utils/StorageTypes.h 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/storage/Utils/StorageTypes.h 2023-01-11 13:42:15.000000000 +0100 @@ -28,9 +28,6 @@ #include <vector> #include <boost/algorithm/string.hpp> -#include "storage/Utils/AppUtil.h" -#include "storage/Utils/StorageTmpl.h" - namespace storage { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/testsuite/CompoundAction/partition-sentence.cc new/libstorage-ng-4.5.63/testsuite/CompoundAction/partition-sentence.cc --- old/libstorage-ng-4.5.62/testsuite/CompoundAction/partition-sentence.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/testsuite/CompoundAction/partition-sentence.cc 2023-01-11 13:42:15.000000000 +0100 @@ -126,18 +126,18 @@ { initialize_with_devicegraph("devicegraph.xml"); - auto partition = Partition::find_by_name(staging, "/dev/sda3"); + Partition* partition = Partition::find_by_name(staging, "/dev/sda3"); - auto fs = partition->get_blk_filesystem(); - fs->create_mount_point("/home"); + BlkFilesystem* fs = partition->get_blk_filesystem(); + fs->create_mount_point("/test2"); const Actiongraph* actiongraph = storage->calculate_actiongraph(); - auto compound_action = find_compound_action_by_target(actiongraph, partition); + const CompoundAction* compound_action = find_compound_action_by_target(actiongraph, partition); BOOST_REQUIRE(compound_action); - BOOST_CHECK_EQUAL(compound_action->sentence(), "Mount partition /dev/sda3 (42.27 GiB) at /home"); + BOOST_CHECK_EQUAL(compound_action->sentence(), "Mount partition /dev/sda3 (42.27 GiB) at /test2"); } @@ -145,15 +145,15 @@ { initialize_with_devicegraph("devicegraph.xml"); - auto partition_name = "/dev/sda2"; + string partition_name = "/dev/sda2"; delete_partition(partition_name); const Actiongraph* actiongraph = storage->calculate_actiongraph(); - auto deleted_partition = Partition::find_by_name(storage->get_system(), partition_name); + Partition* deleted_partition = Partition::find_by_name(storage->get_system(), partition_name); - auto compound_action = find_compound_action_by_target(actiongraph, deleted_partition); + const CompoundAction* compound_action = find_compound_action_by_target(actiongraph, deleted_partition); BOOST_REQUIRE(compound_action); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.62/testsuite/mount-by.cc new/libstorage-ng-4.5.63/testsuite/mount-by.cc --- old/libstorage-ng-4.5.62/testsuite/mount-by.cc 2023-01-07 23:13:58.000000000 +0100 +++ new/libstorage-ng-4.5.63/testsuite/mount-by.cc 2023-01-11 13:42:15.000000000 +0100 @@ -58,7 +58,7 @@ Partition* sda1 = gpt->create_partition("/dev/sda1", Region(1 * 2048, 100 * 2048, 512), PartitionType::PRIMARY); Ext4* ext4 = to_ext4(sda1->create_blk_filesystem(FsType::EXT4)); - MountPoint* mount_point = ext4->create_mount_point("/test"); + MountPoint* mount_point = ext4->create_mount_point("/test1"); BOOST_CHECK_EQUAL(mount_point->get_mount_by(), MountByType::UUID); } @@ -69,7 +69,7 @@ Partition* sda2 = gpt->create_partition("/dev/sda2", Region(1 * 2048, 100 * 2048, 512), PartitionType::PRIMARY); Ext4* ext4 = to_ext4(sda2->create_blk_filesystem(FsType::EXT4)); - MountPoint* mount_point = ext4->create_mount_point("/test"); + MountPoint* mount_point = ext4->create_mount_point("/test2"); BOOST_CHECK_EQUAL(mount_point->get_mount_by(), MountByType::PATH); } @@ -82,9 +82,9 @@ BtrfsSubvolume* top_level = btrfs->get_top_level_btrfs_subvolume(); BtrfsSubvolume* subvolume = top_level->create_btrfs_subvolume("test"); - MountPoint* mount_point1 = btrfs->create_mount_point("/test1"); - MountPoint* mount_point2 = top_level->create_mount_point("/test2"); - MountPoint* mount_point3 = subvolume->create_mount_point("/test3"); + MountPoint* mount_point1 = btrfs->create_mount_point("/test3"); + MountPoint* mount_point2 = top_level->create_mount_point("/test4"); + MountPoint* mount_point3 = subvolume->create_mount_point("/test5"); BOOST_CHECK_EQUAL(mount_point1->get_mount_by(), MountByType::UUID); BOOST_CHECK_EQUAL(mount_point2->get_mount_by(), MountByType::UUID);