Hello community, here is the log from the commit of package libstorage-ng for openSUSE:Factory checked in at 2019-11-20 10:26:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng" Wed Nov 20 10:26:11 2019 rev:68 rq:748300 version:4.2.27 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2019-11-01 15:13:34.692711249 +0100 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.26869/libstorage-ng.changes 2019-11-20 10:26:14.494550377 +0100 @@ -1,0 +2,53 @@ +Wed Nov 13 13:20:32 UTC 2019 - [email protected] + +- merge gh#openSUSE/libstorage-ng#677 +- Make default mount_options public (needed for jsc#SLE-7687) +- Bump version +- Rename Mountable::Impl#get_default_mount_options +- Split MountPoint#set_default_mount_options into pieces (needed + for jsc#SLE-7687) +- 4.2.27 + +-------------------------------------------------------------------- +Sun Nov 10 07:38:14 UTC 2019 - [email protected] + +- Translated using Weblate (Estonian) (bsc#1149754) +- 4.2.26 + +-------------------------------------------------------------------- +Sat Nov 9 07:54:59 UTC 2019 - [email protected] + +- Translated using Weblate (Estonian) (bsc#1149754) +- 4.2.25 + +-------------------------------------------------------------------- +Fri Nov 8 12:25:15 UTC 2019 - [email protected] + +- Translated using Weblate (Estonian) (bsc#1149754) +- 4.2.24 + +-------------------------------------------------------------------- +Thu Nov 7 06:57:57 UTC 2019 - [email protected] + +- Translated using Weblate (Estonian) (bsc#1149754) +- 4.2.23 + +-------------------------------------------------------------------- +Wed Nov 6 12:28:50 UTC 2019 - [email protected] + +- Translated using Weblate (Estonian) (bsc#1149754) +- 4.2.22 + +-------------------------------------------------------------------- +Wed Nov 6 06:23:36 UTC 2019 - [email protected] + +- Translated using Weblate (Estonian) (bsc#1149754) +- 4.2.21 + +-------------------------------------------------------------------- +Tue Nov 5 18:37:00 UTC 2019 - [email protected] + +- Translated using Weblate (Estonian) (bsc#1149754) +- 4.2.20 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-4.2.19.tar.xz New: ---- libstorage-ng-4.2.27.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.kXk4dw/_old 2019-11-20 10:26:15.402550558 +0100 +++ /var/tmp/diff_new_pack.kXk4dw/_new 2019-11-20 10:26:15.402550558 +0100 @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 4.2.19 +Version: 4.2.27 Release: 0 Summary: Library for storage management License: GPL-2.0-only ++++++ libstorage-ng-4.2.19.tar.xz -> libstorage-ng-4.2.27.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.19/LIBVERSION new/libstorage-ng-4.2.27/LIBVERSION --- old/libstorage-ng-4.2.19/LIBVERSION 2019-10-31 14:16:21.000000000 +0100 +++ new/libstorage-ng-4.2.27/LIBVERSION 2019-11-13 14:20:32.000000000 +0100 @@ -1 +1 @@ -1.19.0 +1.20.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.19/VERSION new/libstorage-ng-4.2.27/VERSION --- old/libstorage-ng-4.2.19/VERSION 2019-10-31 14:16:21.000000000 +0100 +++ new/libstorage-ng-4.2.27/VERSION 2019-11-13 14:20:32.000000000 +0100 @@ -1 +1 @@ -4.2.19 +4.2.27 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.19/po/et.po new/libstorage-ng-4.2.27/po/et.po --- old/libstorage-ng-4.2.19/po/et.po 2019-10-31 14:16:21.000000000 +0100 +++ new/libstorage-ng-4.2.27/po/et.po 2019-11-13 14:20:32.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: autoinst.fi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-04 09:26+0200\n" -"PO-Revision-Date: 2019-10-28 16:53+0000\n" +"PO-Revision-Date: 2019-11-10 12:53+0000\n" "Last-Translator: Jaanus Ojangu <[email protected]>\n" "Language-Team: Estonian <https://l10n.opensuse.org/projects/libstorage/" "ng-master/et/>\n" @@ -102,20 +102,20 @@ #. TRANSLATORS: progress message #, c-format msgid "Activating LUKS %s" -msgstr "" +msgstr "Aktiveeritakse LUKS %s" #. TRANSLATORS: error message #, c-format msgid "Activating LUKS %s failed" -msgstr "" +msgstr "Aktiveerimine LUKS %s nurjus" #. TRANSLATORS: progress message msgid "Activating LVM" -msgstr "" +msgstr "LVM aktivireemine" #. TRANSLATORS: error message msgid "Activating LVM failed" -msgstr "" +msgstr "LVM aktiveerimine nurjus" #. TRANSLATORS: displayed during action, #. %1$s is replaced by device name (e.g. /dev/sda1) @@ -180,13 +180,13 @@ #. %1$s is replaced by md name (e.g. /dev/md0) #, c-format msgid "Add %1$s to /etc/mdadm.conf" -msgstr "" +msgstr "Lisa %1$s siia /etc/mdadm.conf" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sda1) #, c-format msgid "Add encryption layer device on %1$s to /etc/crypttab" -msgstr "" +msgstr "Lisage krüptimiskihi seade %1$s kataloogi /etc/crypttab" #. TRANSLATORS: displayed before action, #. %1$s is replaced by the mount point (e.g. /home), @@ -203,7 +203,7 @@ #. and /dev/sdb2 (1.0 GiB)) #, c-format msgid "Add mount point %1$s of subvolume %2$s on %3$s to /etc/fstab" -msgstr "" +msgstr "Lisage seadme %3$s alamosa %2$s haakepunkt %1$s siia /etc/fstab" #. TRANSLATORS: displayed during action, #. %1$s is replaced by the device name (e.g. /dev/sdc1), @@ -228,13 +228,13 @@ #. %1$s is replaced by md name (e.g. /dev/md0) #, c-format msgid "Adding %1$s to /etc/mdadm.conf" -msgstr "" +msgstr "Lisame %1$s siia /etc/mdadm.conf" #. TRANSLATORS: displayed during action, #. %1$s is replaced by device name (e.g. /dev/sda1) #, c-format msgid "Adding encryption layer device on %1$s to /etc/crypttab" -msgstr "" +msgstr "Krüpteerimiskihi seadme lisamine kohas %1$s kausta /etc/crypttab" #. TRANSLATORS: displayed during action, #. %1$s is replaced by the mount point (e.g. /home), @@ -251,7 +251,7 @@ #. and /dev/sdb2 (1.0 GiB)) #, c-format msgid "Adding mount point %1$s of subvolume %2$s on %3$s to /etc/fstab" -msgstr "" +msgstr "Lisades seadme %3$s alammahu %2$s haakepunkti %1$s kataloogi /etc/fstab" #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sda1), @@ -276,23 +276,23 @@ #. TRANSLATORS: name of partition type msgid "BIOS Boot Partition" -msgstr "" +msgstr "BIOS alglaadimise partitsioon" #. TRANSLATORS: name of object msgid "Bcache" -msgstr "" +msgstr "Bcache" #. TRANSLATORS: name of object msgid "Bcache Cache Set" -msgstr "" +msgstr "Bcache vahemälu kogum" #. TRANSLATORS: name of object msgid "Btrfs" -msgstr "" +msgstr "Btrfs" #. TRANSLATORS: name of object msgid "Btrfs Subvolume" -msgstr "" +msgstr "Btrfs Subvolume" #. TRANSLATORS: displayed before action, #. %1$s is replaced by partition name (e.g. /dev/sda1) @@ -316,9 +316,9 @@ #. TRANSLATORS: displayed before action, #. %1$s is replaced by device name (e.g. /dev/sda) -#, c-format +#, c-format, fuzzy msgid "Clear protective MBR boot flag of GPT on %1$s" -msgstr "" +msgstr "GPT selge kaitsev MBR alglaadimislipp %1$s" #. TRANSLATORS: displayed during action, #. %1$s is replaced by partition name (e.g. /dev/sda1) @@ -338,13 +338,13 @@ #. and /dev/sdb2 (1.0 GiB)) #, c-format msgid "Clearing option 'no copy on write' for subvolume %1$s on %2$s" -msgstr "" +msgstr "%2$s alamosa %1$s tühjendamise võimalus 'kirjutamisel koopiat ei tehta'" #. TRANSLATORS: displayed during action, #. %1$s is replaced by device name (e.g. /dev/sda) #, c-format msgid "Clearing protective MBR boot flag of GPT on %1$s" -msgstr "" +msgstr "GPT kaitsva MBR alglaadimislipu eemaldamine %1$s" #. TRANSLATORS: #. %1$s is replaced with the md level (e.g. RAID1), @@ -733,7 +733,7 @@ #. %2$s is replaced with the mount point (e.g. /home) #, c-format msgid "Create file system btrfs on %1$s and mount at %2$s" -msgstr "" +msgstr "Loo failisüsteemi btrfs %1$s ja haagi %2$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by the device name (e.g. /dev/vda), @@ -1043,7 +1043,7 @@ #. TRANSLATORS: name of object msgid "DASD" -msgstr "" +msgstr "DASD" #. TRANSLATORS: name of object #, fuzzy @@ -1052,7 +1052,7 @@ #. TRANSLATORS: name of object msgid "DM RAID" -msgstr "" +msgstr "DM RAID" #. TRANSLATORS: displayed before action, #. %1$s is replaced by RAID level (e.g. RAID0), @@ -1508,6 +1508,12 @@ "These logical volumes are ignored. Operations on the\n" "correponding volume groups may fail." msgstr "" +"On tuvastatud toetamata tüüpide LVM-i loogilised köited:\n" +"\n" +"%1$s\n" +"\n" +"Neid loogilisi osi eiratakse. Toimingud\n" +"osade gruppide vastavusse viimisel võivad nurjuda." #. TRANSLATORS: Error message displayed during probing, #. %1$s is replaced by the device name (e.g. /dev/sda) @@ -1516,6 +1522,8 @@ "Detected a LUKS device next to a partition table on the\n" "device %1$s. The LUKS device will be ignored." msgstr "" +"Tuvastati LUKS-i seade partitsioonitabeli kõrval, seadmel %1$s. LUKS-seadet " +"ignoreeritakse." #. TRANSLATORS: Error message displayed during probing, #. %1$s is replaced by the device name (e.g. /dev/sda) @@ -1524,6 +1532,8 @@ "Detected a LVM logical volume next to a partition table on the\n" "device %1$s. The LVM logical volume will be ignored." msgstr "" +"Tuvastati LVM-i loogiline osa partitsioonitabeli kõrval, seadmel %1$s. LVM-i " +"loogilist köidet eiratakse." #. TRANSLATORS: Error message displayed during probing, #. %1$s is replaced by the device name (e.g. /dev/sda) @@ -1532,14 +1542,16 @@ "Detected a file system next to a partition table on the\n" "device %1$s. The file system will be ignored." msgstr "" +"Tuvastati failisüsteem partitsioonitabeli kõrval, seadmeil %1$s. " +"Failisüsteemi eiratakse." #. TRANSLATORS: name of partition type msgid "Diagnostics Partition" -msgstr "" +msgstr "Diagnostikapartitsioon" #. TRANSLATORS: name of object msgid "Disk" -msgstr "" +msgstr "Ketas" #. TRANSLATORS: symbol for "exa" (best keep untranslated) #, fuzzy @@ -1553,7 +1565,7 @@ #. TRANSLATORS: name of partition type msgid "EFI System Partition" -msgstr "" +msgstr "EFI süsteemne partitsioon" #. TRANSLATORS: symbol for "exbi bytes" (best keep untranslated) #, fuzzy @@ -1669,23 +1681,23 @@ #. TRANSLATORS: name of object msgid "Encryption" -msgstr "" +msgstr "Krüptimine" #. TRANSLATORS: name of object msgid "Ext2" -msgstr "" +msgstr "Ext2" #. TRANSLATORS: name of object msgid "Ext3" -msgstr "" +msgstr "Ext3" #. TRANSLATORS: name of object msgid "Ext4" -msgstr "" +msgstr "Ext4" #. TRANSLATORS: name of object msgid "F2FS" -msgstr "" +msgstr "F2FS" #. TRANSLATORS: #. %1$s is replaced with the md level (e.g. RAID1), @@ -1787,7 +1799,7 @@ #. TRANSLATORS: name of object msgid "GPT" -msgstr "" +msgstr "GPT" #. TRANSLATORS: symbol for "gibi bytes" (best keep untranslated) #, fuzzy @@ -1940,19 +1952,19 @@ #. TRANSLATORS: name of object msgid "ISO 9660" -msgstr "" +msgstr "ISO 9660" #. TRANSLATORS: name of object msgid "Implicit Partition Table" -msgstr "" +msgstr "Kaudne partitsioonitabel" #. TRANSLATORS: name of partition type msgid "Intel RST" -msgstr "" +msgstr "Intel RST" #. TRANSLATORS: name of object msgid "JFS" -msgstr "" +msgstr "JFS" #. TRANSLATORS: symbol for "kibi bytes" (best keep untranslated) msgid "KiB" @@ -1960,35 +1972,35 @@ #. TRANSLATORS: name of object msgid "LUKS" -msgstr "" +msgstr "LUKS" #. TRANSLATORS: name of object msgid "LVM Logical Volume" -msgstr "" +msgstr "LVM loogiline alamosa" #. TRANSLATORS: name of object msgid "LVM Physical Volume" -msgstr "" +msgstr "LVM füüsiline osa" #. TRANSLATORS: name of object msgid "LVM Volume Group" -msgstr "" +msgstr "LVM osade grupp" #. TRANSLATORS: name of partition type msgid "Linux" -msgstr "" +msgstr "Linux" #. TRANSLATORS: name of partition type msgid "Linux LVM" -msgstr "" +msgstr "Linux LVM" #. TRANSLATORS: name of partition type msgid "Linux RAID" -msgstr "" +msgstr "Linux RAID" #. TRANSLATORS: name of partition type msgid "Linux Swap" -msgstr "" +msgstr "Linux Swap" #. TRANSLATORS: symbol for "mega" (best keep untranslated) #, fuzzy @@ -2001,7 +2013,7 @@ #. TRANSLATORS: name of object msgid "MD RAID" -msgstr "" +msgstr "MD RAID" #. TRANSLATORS: name of object #, fuzzy @@ -2014,7 +2026,7 @@ #. TRANSLATORS: name of partition type msgid "Microsoft Reserved Partition" -msgstr "" +msgstr "Microsoftile reserveeritud partitsioon" #. TRANSLATORS: #. %1$s is replaced with the md level (e.g. RAID1), @@ -2051,7 +2063,7 @@ #. TRANSLATORS: name of object msgid "Mount Point" -msgstr "" +msgstr "Haakepunkt" #. TRANSLATORS: #. %1$s is replaced with the bcache name (e.g. /dev/bcache0), @@ -2105,15 +2117,15 @@ #. TRANSLATORS: name of object msgid "Multipath" -msgstr "" +msgstr "Multirada" #. TRANSLATORS: name of object msgid "NFS" -msgstr "" +msgstr "NFS" #. TRANSLATORS: name of object msgid "NTFS" -msgstr "" +msgstr "NTFS" #. TRANSLATORS: symbol for "peta" (best keep untranslated) #, fuzzy @@ -2127,11 +2139,11 @@ #. TRANSLATORS: name of partition type msgid "PReP Boot Partition" -msgstr "" +msgstr "PReP algkäivituspartitsioon" #. TRANSLATORS: name of object msgid "Partition" -msgstr "" +msgstr "Partitsioon" #. TRANSLATORS: symbol for "pebi bytes" (best keep untranslated) #, fuzzy @@ -2140,65 +2152,65 @@ #. TRANSLATORS: name of object msgid "Plain Encryption" -msgstr "" +msgstr "Tavaline krüptimine" #. TRANSLATORS: error message #, c-format msgid "Probing DASD %s failed" -msgstr "" +msgstr "DASD %s uurimine nurjus" #. TRANSLATORS: progress message msgid "Probing DASDs" -msgstr "" +msgstr "DASDs uurimine" #. TRANSLATORS: error message msgid "Probing DASDs failed" -msgstr "" +msgstr "DASD uurimine nurjus" #. TRANSLATORS: progress message msgid "Probing DM RAIDs" -msgstr "" +msgstr "DM RAID uurimine" #. TRANSLATORS: error message msgid "Probing DM RAIDs failed" -msgstr "" +msgstr "DM RAID uurimine nurjus" #. TRANSLATORS: progress message msgid "Probing LUKS" -msgstr "" +msgstr "LUKS uurimine" #. TRANSLATORS: error message msgid "Probing LUKS failed" -msgstr "" +msgstr "LUKS uurimine nurjus" #. TRANSLATORS: progress message msgid "Probing LVM" -msgstr "" +msgstr "LVM uurimine" #. TRANSLATORS: error message msgid "Probing LVM failed" -msgstr "" +msgstr "LVM uurimine nurjus" #. TRANSLATORS: error message #, c-format msgid "Probing MD RAID %s failed" -msgstr "" +msgstr "MD RAID %s uurimine nurjus" #. TRANSLATORS: progress message msgid "Probing MD RAIDs" -msgstr "" +msgstr "MD RAID uurimine" #. TRANSLATORS: error message msgid "Probing MD RAIDs failed" -msgstr "" +msgstr "MD RAID uurimine nurjus" #. TRANSLATORS: progress message msgid "Probing NFS" -msgstr "" +msgstr "NFS uurimine" #. TRANSLATORS: error message msgid "Probing NFS failed" -msgstr "" +msgstr "NFS uurimine nurjus" #. TRANSLATORS: progress message #, fuzzy @@ -2212,37 +2224,37 @@ #. TRANSLATORS: progress message msgid "Probing bcache" -msgstr "" +msgstr "Bcache uurimine" #. TRANSLATORS: error message #, c-format msgid "Probing bcache %s failed" -msgstr "" +msgstr "Bcache %s uurimine nurjus" #. TRANSLATORS: error message msgid "Probing bcache failed" -msgstr "" +msgstr "Bcache uurimine nurjus" #. TRANSLATORS: progress message msgid "Probing device relationships" -msgstr "" +msgstr "Seadme ühenduste uurimine" #. TRANSLATORS: error message msgid "Probing device relationships failed" -msgstr "" +msgstr "Seadme ühenduste uurimine nurjus" #. TRANSLATORS: error message #, c-format msgid "Probing disk %s failed" -msgstr "" +msgstr "Ketta %s uurimine nurjus" #. TRANSLATORS: progress message msgid "Probing disks" -msgstr "" +msgstr "Ketta uurimine" #. TRANSLATORS: error message msgid "Probing disks failed" -msgstr "" +msgstr "Ketta uurimine nurjus" #. TRANSLATORS: error message #, fuzzy @@ -2252,7 +2264,7 @@ #. TRANSLATORS: error message #, c-format msgid "Probing file system on %s failed" -msgstr "" +msgstr "Failisüsteemi uurimine seadmel %s ebaõnnestus" #. TRANSLATORS: error message #, fuzzy, c-format @@ -2261,19 +2273,19 @@ #. TRANSLATORS: progress message msgid "Probing file systems" -msgstr "" +msgstr "Failisüsteemi uurimine" #. TRANSLATORS: error message msgid "Probing file systems failed" -msgstr "" +msgstr "Failisüsteemi uurimine ebaõnnestus" #. TRANSLATORS: progress message msgid "Probing multipath" -msgstr "" +msgstr "Multiühenduse uurimine" #. TRANSLATORS: error message msgid "Probing multipath failed" -msgstr "" +msgstr "Multiühenduste uurimine nurjus" #. TRANSLATORS: progress message #, fuzzy @@ -2282,7 +2294,7 @@ #. TRANSLATORS: error message msgid "Probing partitions failed" -msgstr "" +msgstr "Partitsioonide uurimine nurjus" #. TRANSLATORS: error message #, fuzzy, c-format @@ -2318,13 +2330,13 @@ #. %1$s is replaced by volume group name (e.g. system) #, c-format msgid "Reduce volume group %1$s by missing physical volumes" -msgstr "" +msgstr "Vähendage partistsiooniderühma %1$s füüsiliste osade puudumisel" #. TRANSLATORS: displayed during action, #. %1$s is replaced by volume group name (e.g. system) #, c-format msgid "Reducing volume group %1$s by missing physical volumes" -msgstr "" +msgstr "Partitsioonide rühma vähendamine %1$s füüsiliste osade puudumisel" #. TRANSLATORS: name of object msgid "Reiserfs" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.19/storage/Filesystems/BtrfsSubvolumeImpl.cc new/libstorage-ng-4.2.27/storage/Filesystems/BtrfsSubvolumeImpl.cc --- old/libstorage-ng-4.2.19/storage/Filesystems/BtrfsSubvolumeImpl.cc 2019-10-31 14:16:21.000000000 +0100 +++ new/libstorage-ng-4.2.27/storage/Filesystems/BtrfsSubvolumeImpl.cc 2019-11-13 14:20:32.000000000 +0100 @@ -199,7 +199,7 @@ MountOpts - BtrfsSubvolume::Impl::get_default_mount_options() const + BtrfsSubvolume::Impl::default_mount_options() const { // NOTE: This is used for both: fstab and mount command. // In case of fstab, subvol path cannot be quoted, and the usage of scape @@ -213,7 +213,7 @@ vector<string> BtrfsSubvolume::Impl::get_mount_options() const { - // See get_default_mount_options() + // See default_mount_options() return vector<string>({ "subvol=/" + path }); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.19/storage/Filesystems/BtrfsSubvolumeImpl.h new/libstorage-ng-4.2.27/storage/Filesystems/BtrfsSubvolumeImpl.h --- old/libstorage-ng-4.2.19/storage/Filesystems/BtrfsSubvolumeImpl.h 2019-10-31 14:16:21.000000000 +0100 +++ new/libstorage-ng-4.2.27/storage/Filesystems/BtrfsSubvolumeImpl.h 2019-11-13 14:20:32.000000000 +0100 @@ -97,7 +97,7 @@ virtual vector<string> get_mount_options() const override; virtual MountByType get_default_mount_by() const override; - virtual MountOpts get_default_mount_options() const override; + virtual MountOpts default_mount_options() const override; virtual vector<ExtendedFstabEntry> find_etc_fstab_entries_unfiltered(SystemInfo& system_info) const override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.19/storage/Filesystems/MountPoint.cc new/libstorage-ng-4.2.27/storage/Filesystems/MountPoint.cc --- old/libstorage-ng-4.2.19/storage/Filesystems/MountPoint.cc 2019-10-31 14:16:21.000000000 +0100 +++ new/libstorage-ng-4.2.27/storage/Filesystems/MountPoint.cc 2019-11-13 14:20:32.000000000 +0100 @@ -137,6 +137,13 @@ } + vector<string> + MountPoint::default_mount_options() const + { + return get_impl().default_mount_options().get_opts(); + } + + const vector<string>& MountPoint::get_mount_options() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.19/storage/Filesystems/MountPoint.h new/libstorage-ng-4.2.27/storage/Filesystems/MountPoint.h --- old/libstorage-ng-4.2.19/storage/Filesystems/MountPoint.h 2019-10-31 14:16:21.000000000 +0100 +++ new/libstorage-ng-4.2.27/storage/Filesystems/MountPoint.h 2019-11-13 14:20:32.000000000 +0100 @@ -108,8 +108,15 @@ void set_mount_options(const std::vector<std::string>& mount_options); /** - * Set the mount options to the default mount options. So far the - * default mount options only contain the subvol for btrfs subvolumes. + * Default mount options. So far the default mount options only contain + * the subvol for btrfs subvolumes. + */ + std::vector<std::string> default_mount_options() const; + + /** + * Set the mount options to the default mount options. + * + * @see default_mount_options(). */ void set_default_mount_options(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.19/storage/Filesystems/MountPointImpl.cc new/libstorage-ng-4.2.27/storage/Filesystems/MountPointImpl.cc --- old/libstorage-ng-4.2.19/storage/Filesystems/MountPointImpl.cc 2019-10-31 14:16:21.000000000 +0100 +++ new/libstorage-ng-4.2.27/storage/Filesystems/MountPointImpl.cc 2019-11-13 14:20:32.000000000 +0100 @@ -340,10 +340,17 @@ } + MountOpts + MountPoint::Impl::default_mount_options() const + { + return get_mountable()->get_impl().default_mount_options(); + } + + void MountPoint::Impl::set_default_mount_options() { - set_mount_options(get_mountable()->get_impl().get_default_mount_options()); + set_mount_options(default_mount_options()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.19/storage/Filesystems/MountPointImpl.h new/libstorage-ng-4.2.27/storage/Filesystems/MountPointImpl.h --- old/libstorage-ng-4.2.19/storage/Filesystems/MountPointImpl.h 2019-10-31 14:16:21.000000000 +0100 +++ new/libstorage-ng-4.2.27/storage/Filesystems/MountPointImpl.h 2019-11-13 14:20:32.000000000 +0100 @@ -102,6 +102,7 @@ void set_mount_options(const MountOpts& mount_options); void set_mount_options(const vector<string>& mount_options); + MountOpts default_mount_options() const; void set_default_mount_options(); int get_freq() const { return freq; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.19/storage/Filesystems/MountableImpl.cc new/libstorage-ng-4.2.27/storage/Filesystems/MountableImpl.cc --- old/libstorage-ng-4.2.19/storage/Filesystems/MountableImpl.cc 2019-10-31 14:16:21.000000000 +0100 +++ new/libstorage-ng-4.2.27/storage/Filesystems/MountableImpl.cc 2019-11-13 14:20:32.000000000 +0100 @@ -169,7 +169,7 @@ MountOpts - Mountable::Impl::get_default_mount_options() const + Mountable::Impl::default_mount_options() const { return MountOpts(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.2.19/storage/Filesystems/MountableImpl.h new/libstorage-ng-4.2.27/storage/Filesystems/MountableImpl.h --- old/libstorage-ng-4.2.19/storage/Filesystems/MountableImpl.h 2019-10-31 14:16:21.000000000 +0100 +++ new/libstorage-ng-4.2.27/storage/Filesystems/MountableImpl.h 2019-11-13 14:20:32.000000000 +0100 @@ -84,7 +84,7 @@ virtual MountByType get_default_mount_by() const = 0; - virtual MountOpts get_default_mount_options() const; + virtual MountOpts default_mount_options() const; /** * A name for the mountable in messages. E.g. for
