Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2021-02-01 14:42:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2" Mon Feb 1 14:42:14 2021 rev:296 rq:868321 version:4.3.67 Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2021-01-19 16:01:22.667305909 +0100 +++ /work/SRC/openSUSE:Factory/.autoyast2.new.28504/autoyast2.changes 2021-02-01 14:42:22.876726069 +0100 @@ -1,0 +2,14 @@ +Mon Feb 1 09:09:15 UTC 2021 - Ancor Gonzalez Sosa <ancor@suse.com> + +- AutoYaST UI: fixed field Mount Options (fstopt) in the + partitioning section (bsc#1181577). +- 4.3.67 + +------------------------------------------------------------------- +Thu Jan 28 16:54:47 UTC 2021 - Ancor Gonzalez Sosa <ancor@suse.com> + +- AutoYaST UI: added drive types CT_NFS and CT_TMPFS to the + partitioning section (part of jsc#SLE-11308). +- 4.3.66 + +------------------------------------------------------------------- Old: ---- autoyast2-4.3.65.tar.bz2 New: ---- autoyast2-4.3.67.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.lvbhCW/_old 2021-02-01 14:42:23.572727067 +0100 +++ /var/tmp/diff_new_pack.lvbhCW/_new 2021-02-01 14:42:23.576727072 +0100 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.3.65 +Version: 4.3.67 Release: 0 Summary: YaST2 - Automated Installation License: GPL-2.0-only ++++++ autoyast2-4.3.65.tar.bz2 -> autoyast2-4.3.67.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/.github/workflows/ci.yml new/autoyast2-4.3.67/.github/workflows/ci.yml --- old/autoyast2-4.3.65/.github/workflows/ci.yml 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/.github/workflows/ci.yml 2021-02-01 11:13:12.000000000 +0100 @@ -13,7 +13,7 @@ steps: - name: Git Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2 # just for easier debugging... - name: Inspect Installed Packages @@ -38,7 +38,7 @@ steps: - name: Git Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: Rubocop run: rake check:rubocop @@ -50,7 +50,7 @@ steps: - name: Git Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: Package Build run: yast-ci-ruby -o package @@ -62,7 +62,7 @@ steps: - name: Git Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: Yardoc run: rake check:doc @@ -76,7 +76,7 @@ steps: - name: Git Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: Perl Syntax run: yast-ci-ruby -o perl_syntax diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/package/autoyast2.changes new/autoyast2-4.3.67/package/autoyast2.changes --- old/autoyast2-4.3.65/package/autoyast2.changes 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/package/autoyast2.changes 2021-02-01 11:13:12.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Feb 1 09:09:15 UTC 2021 - Ancor Gonzalez Sosa <ancor@suse.com> + +- AutoYaST UI: fixed field Mount Options (fstopt) in the + partitioning section (bsc#1181577). +- 4.3.67 + +------------------------------------------------------------------- +Thu Jan 28 16:54:47 UTC 2021 - Ancor Gonzalez Sosa <ancor@suse.com> + +- AutoYaST UI: added drive types CT_NFS and CT_TMPFS to the + partitioning section (part of jsc#SLE-11308). +- 4.3.66 + +------------------------------------------------------------------- Thu Jan 14 14:38:35 UTC 2021 - Stefan Schubert <schubi@suse.de> - Upgrade: Checking if a valid base product has been selected for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/package/autoyast2.spec new/autoyast2-4.3.67/package/autoyast2.spec --- old/autoyast2-4.3.65/package/autoyast2.spec 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/package/autoyast2.spec 2021-02-01 11:13:12.000000000 +0100 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.3.65 +Version: 4.3.67 Release: 0 Summary: YaST2 - Automated Installation License: GPL-2.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/presenters/drive_type.rb new/autoyast2-4.3.67/src/lib/autoinstall/presenters/drive_type.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/presenters/drive_type.rb 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/presenters/drive_type.rb 2021-02-01 11:13:12.000000000 +0100 @@ -45,12 +45,16 @@ # DriveType for CT_RAID RAID = new(:CT_RAID, N_("RAID")).freeze # DriveType for CT_BCACHE - BCACHE = new(:CT_BCACHE, N_("bcache")).freeze + BCACHE = new(:CT_BCACHE, N_("Bcache")).freeze # DriveType for CT_BTRFS BTRFS = new(:CT_BTRFS, N_("Btrfs")).freeze + # DriveType for CT_NFS + NFS = new(:CT_NFS, N_("NFS")).freeze + # DriveType for CT_TMPFS + TMPFS = new(:CT_TMPFS, N_("Tmpfs")).freeze # All drive types - ALL = [DISK, RAID, LVM, BCACHE, BTRFS].freeze + ALL = [DISK, RAID, LVM, BCACHE, BTRFS, NFS, TMPFS].freeze # All possible types # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/presenters/partition.rb new/autoyast2-4.3.67/src/lib/autoinstall/presenters/partition.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/presenters/partition.rb 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/presenters/partition.rb 2021-02-01 11:13:12.000000000 +0100 @@ -84,6 +84,18 @@ drive_presenter.type end + # String representation of #fstab_options + # + # The field is actually called fstopt in the AutoYaST xml and treated like a plain string, + # so this method provides a more direct communication between the profile and the current + # UI (which also uses a plain InputField). + # + # @return [String, nil] nil if there are no fstab_options (which is consistent with the + # behavior of all other attributes of Y2Storage::AutoinstProfile::PartitionSection) + def fstopt + fstab_options&.join(",") + end + # Whether the section is an LVM Logical Volume # # @return [Boolean] true when belongs to an LVM drive; false otherwise @@ -91,6 +103,20 @@ drive_type.to_sym == :CT_LVM end + # Whether this belongs to a drive that is only used to represent filesystems + # + # @return [Boolean] + def filesystem_drive? + [:CT_NFS, :CT_TMPFS, :CT_BTRFS].include?(drive_type.to_sym) + end + + # Whether this represents a device that only exists in the system when it's mounted + # + # @return [Boolean] false if this is no backed (directly or indirectly) by block devices + def fstab_based? + [:CT_NFS, :CT_TMPFS].include?(drive_type.to_sym) + end + # Values to suggest for bcache devices fields # # @return [Array<String>] @@ -164,6 +190,10 @@ # TRANSLATORS: 'Partition' is the name of a section in the AutoYaST # profile, so it's likely not a good idea to translate the term _("Partition (LV)") + when :filesystem + # TRANSLATORS: 'Partition' is the name of a section in the AutoYaST + # profile, so it's likely not a good idea to translate the term + _("Partition (File System)") else # TRANSLATORS: 'Partition' is the name of a section in the AutoYaST # profile, so it's likely not a good idea to translate the term @@ -203,9 +233,30 @@ def device_type return :lv if drive.type == :CT_LVM - return :partition unless drive.unwanted_partitions? + return device_type_no_partitions if drive.master_partition + + (drive.type == :CT_TMPFS) ? :filesystem : :partition + end + + # @see #device_type + def device_type_no_partitions + return :drive if drive.master_partition == section - (drive.master_partition == section) ? :drive : :none + :none + end + + # @see Section#clean_section + def clean_section(attrs) + # "fstopt" is the right key to use as part of the hash received by + # Y2Storage::AutoinstProfile::PartitionSection.init_from_hashes, + # but the corresponding attribute in that class is called #fstab_options + new_attrs = + if attrs.include?("fstopt") + attrs - ["fstopt"] + ["fstab_options"] + else + attrs + end + super(new_attrs) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/bcache_page.rb new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/bcache_page.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/bcache_page.rb 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/bcache_page.rb 2021-02-01 11:13:12.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) [2020] SUSE LLC +# Copyright (c) [2020-2021] SUSE LLC # # All Rights Reserved. # @@ -21,6 +21,7 @@ require "autoinstall/widgets/storage/drive_page" require "autoinstall/widgets/storage/bcache_device" require "autoinstall/widgets/storage/cache_mode" +require "autoinstall/widgets/storage/disklabel" module Y2Autoinstallation module Widgets @@ -37,7 +38,8 @@ def widgets [ HSquash(MinWidth(15, device_widget)), - cache_mode_widget + cache_mode_widget, + disklabel_widget ] end @@ -45,12 +47,14 @@ def init_widgets_values device_widget.value = section.device cache_mode_widget.value = section.bcache_options&.cache_mode + disklabel_widget.value = drive.disklabel end # @see DrivePage#widgets_values def widgets_values { "device" => device_widget.value, + "disklabel" => disklabel_widget.value, "bcache_options" => { "cache_mode" => cache_mode_widget.value } @@ -68,6 +72,11 @@ def cache_mode_widget @cache_mode_widget ||= CacheMode.new end + + # Widget for setting the type of the partition table + def disklabel_widget + @disklabel_widget ||= Disklabel.new + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/filesystem_attrs.rb new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/filesystem_attrs.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/filesystem_attrs.rb 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/filesystem_attrs.rb 2021-02-01 11:13:12.000000000 +0100 @@ -53,31 +53,15 @@ # @macro seeCustomWidget def contents - VBox( - Left( - HBox( - filesystem_widget, - HSpacing(2), - HSquash(MinWidth(15, label_widget)) - ) - ), - VSpacing(0.5), - Left(create_subvolumes_widget), - VSpacing(0.5), - Left( - HBox( - HSquash(MinWidth(15, mount_point_widget)), - HSpacing(2), - mountby_widget, - HSpacing(2), - HSquash(fstab_options_widget) - ) - ), - VSpacing(0.5), - Left( - HSquash(MinWidth(35, mkfs_options_widget)) + if section.fstab_based? + VBox(*mount_widgets) + else + VBox( + *mount_widgets, + VSpacing(0.5), + *format_widgets ) - ) + end end # @macro seeAbstractWidget @@ -86,7 +70,7 @@ label_widget.value = section.label mount_point_widget.value = section.mount mountby_widget.value = section.mountby - fstab_options_widget.value = section.fstab_options + fstab_options_widget.value = section.fstopt mkfs_options_widget.value = section.mkfs_options create_subvolumes_widget.value = section.create_subvolumes @@ -102,7 +86,7 @@ "label" => label_widget.value, "mount" => mount_point_widget.value, "mountby" => mountby_widget.value, - "fstab_options" => fstab_options_widget.value, + "fstopt" => fstab_options_widget.value, "mkfs_options" => mkfs_options_widget.value, "create_subvolumes" => btrfs? ? create_subvolumes_widget.value : nil } @@ -170,6 +154,40 @@ def create_subvolumes_widget @create_subvolumes_widget ||= CreateSubvolumes.new end + + # @see #contents + def format_widgets + [ + Left( + HBox( + filesystem_widget, + HSpacing(2), + HSquash(MinWidth(15, label_widget)) + ) + ), + VSpacing(0.5), + Left( + HSquash(MinWidth(35, mkfs_options_widget)) + ), + VSpacing(0.5), + Left(create_subvolumes_widget) + ] + end + + # @see #contents + def mount_widgets + [ + Left( + HBox( + HSquash(MinWidth(15, mount_point_widget)), + HSpacing(2), + mountby_widget, + HSpacing(2), + HSquash(fstab_options_widget) + ) + ) + ] + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/nfs_name.rb new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/nfs_name.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/nfs_name.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/nfs_name.rb 2021-02-01 11:13:12.000000000 +0100 @@ -0,0 +1,40 @@ +# Copyright (c) [2021] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "cwm/common_widgets" + +module Y2Autoinstallation + module Widgets + module Storage + # Determines the name of an NFS mount + class NfsName < CWM::InputField + def initalize + textdomain "autoinst" + super + end + + # @macro seeAbstractWidget + def label + _("NFS Share Name") + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/nfs_page.rb new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/nfs_page.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/nfs_page.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/nfs_page.rb 2021-02-01 11:13:12.000000000 +0100 @@ -0,0 +1,66 @@ +# Copyright (c) [2021] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "autoinstall/widgets/storage/drive_page" +require "autoinstall/widgets/storage/nfs_name" + +module Y2Autoinstallation + module Widgets + module Storage + # This page allows to edit a `drive` section representing an NFS mount + class NfsPage < DrivePage + # @see DrivePage#initialize + def initialize(*args) + textdomain "autoinst" + super + end + + # @macro seeCustomWidget + def contents + MarginBox( + 0.5, + 0, + VBox( + Left(HSquash(nfs_name_widget)), + VStretch() + ) + ) + end + + # @see DrivePage#init + def init + nfs_name_widget.value = drive.device + end + + # @see DrivePage#values + def values + { "device" => nfs_name_widget.value } + end + + private + + # Widget for setting the name of the NFS mount + def nfs_name_widget + @nfs_name_widget ||= NfsName.new + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/overview_tree_pager.rb new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/overview_tree_pager.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/overview_tree_pager.rb 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/overview_tree_pager.rb 2021-02-01 11:13:12.000000000 +0100 @@ -25,6 +25,8 @@ require "autoinstall/widgets/storage/lvm_page" require "autoinstall/widgets/storage/bcache_page" require "autoinstall/widgets/storage/btrfs_page" +require "autoinstall/widgets/storage/nfs_page" +require "autoinstall/widgets/storage/tmpfs_page" require "autoinstall/widgets/storage/partition_page" require "autoinstall/widgets/storage/add_drive_button" require "autoinstall/widgets/storage/add_partition_button" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/partition_page.rb new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/partition_page.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/partition_page.rb 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/partition_page.rb 2021-02-01 11:13:12.000000000 +0100 @@ -65,16 +65,20 @@ # Tabs to display the partition section data # - # First tab contains common options for a partition section (including those that depend on - # the parent section type). The second one allows to choose the partition usage and its - # related options. + # Normally, the first tab contains common options for a partition section (including those + # that depend on the parent section type). The second one allows to choose the partition + # usage and its related options. In some cases, that second tab is enough. # # @return [CWM::Tabs] def tabs - CWM::Tabs.new( - general_tab, - usage_tab - ) + if partition.fstab_based? + CWM::Tabs.new(usage_tab) + else + CWM::Tabs.new( + general_tab, + usage_tab + ) + end end # Tab to display common options for all partition sections diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/partition_usage_tab.rb new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/partition_usage_tab.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/partition_usage_tab.rb 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/partition_usage_tab.rb 2021-02-01 11:13:12.000000000 +0100 @@ -30,6 +30,7 @@ require "autoinstall/widgets/storage/btrfs_member_attrs" require "autoinstall/widgets/storage/encryption_attrs" require "autoinstall/widgets/storage/used_as" +require "autoinstall/widgets/storage/used_as_filesystem" module Y2Autoinstallation module Widgets @@ -119,7 +120,7 @@ # Widget for choosing the partition usage def used_as_widget - @used_as_widget ||= UsedAs.new + @used_as_widget ||= partition.filesystem_drive? ? UsedAsFilesystem.new : UsedAs.new end def replace_point diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/raid_page.rb new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/raid_page.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/raid_page.rb 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/raid_page.rb 2021-02-01 11:13:12.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (c) [2020] SUSE LLC +# Copyright (c) [2020-2021] SUSE LLC # # All Rights Reserved. # @@ -23,6 +23,7 @@ require "autoinstall/widgets/storage/md_level" require "autoinstall/widgets/storage/chunk_size" require "autoinstall/widgets/storage/parity_algorithm" +require "autoinstall/widgets/storage/disklabel" module Y2Autoinstallation module Widgets @@ -41,7 +42,8 @@ HSquash(raid_name_widget), md_level_widget, parity_algorithm_widget, - chunk_size_widget + chunk_size_widget, + disklabel_widget ] end @@ -49,6 +51,7 @@ def init_widgets_values raid_name_widget.value = drive.device raid_options = drive.raid_options + disklabel_widget.value = drive.disklabel if raid_options md_level_widget.value = raid_options.raid_type.to_s parity_algorithm_widget.value = raid_options.parity_algorithm @@ -60,6 +63,7 @@ def widgets_values { "device" => raid_name_widget.value, + "disklabel" => disklabel_widget.value, "raid_options" => { "raid_type" => md_level_widget.value, "parity_algorithm" => parity_algorithm_widget.value, @@ -89,6 +93,11 @@ def chunk_size_widget @chunk_size_widget ||= ChunkSize.new end + + # Widget for setting the type of the RAID partition table + def disklabel_widget + @disklabel_widget ||= Disklabel.new + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/tmpfs_page.rb new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/tmpfs_page.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/tmpfs_page.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/tmpfs_page.rb 2021-02-01 11:13:12.000000000 +0100 @@ -0,0 +1,40 @@ +# Copyright (c) [2021] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "autoinstall/widgets/storage/drive_page" + +module Y2Autoinstallation + module Widgets + module Storage + # This page allows to edit a `drive` section representing tmpfs filesystems + class TmpfsPage < DrivePage + # @macro seeCustomWidget + def contents + Empty() + end + + # @see DrivePage#values + def values + {} + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/used_as.rb new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/used_as.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/used_as.rb 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/used_as.rb 2021-02-01 11:13:12.000000000 +0100 @@ -45,7 +45,6 @@ # @macro seeComboBox def items - # FIXME: uncomment when support for each type is added [ # TRANSLATORS: option for setting to not use the partition [:none, _("Do Not Use")], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/used_as_filesystem.rb new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/used_as_filesystem.rb --- old/autoyast2-4.3.65/src/lib/autoinstall/widgets/storage/used_as_filesystem.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-4.3.67/src/lib/autoinstall/widgets/storage/used_as_filesystem.rb 2021-02-01 11:13:12.000000000 +0100 @@ -0,0 +1,46 @@ +# Copyright (c) [2021] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "autoinstall/widgets/storage/used_as" + +module Y2Autoinstallation + module Widgets + module Storage + # Special subclass of {UsedAs} with only one option + class UsedAsFilesystem < UsedAs + # Constructor + def initialize + textdomain "autoinst" + super + end + + # @macro seeComboBox + def items + [ + # TRANSLATORS: option for setting to not use the partition + [:none, _("Do Not Use")], + # TRANSLATORS: option for setting the partition to hold a file system + [:filesystem, _("File System")] + ] + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/test/lib/widgets/storage/filesystem_attrs_test.rb new/autoyast2-4.3.67/test/lib/widgets/storage/filesystem_attrs_test.rb --- old/autoyast2-4.3.65/test/lib/widgets/storage/filesystem_attrs_test.rb 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/test/lib/widgets/storage/filesystem_attrs_test.rb 2021-02-01 11:13:12.000000000 +0100 @@ -19,14 +19,22 @@ require_relative "../../../test_helper" require "y2storage" +require "autoinstall/presenters" require "autoinstall/widgets/storage/filesystem_attrs" require "cwm/rspec" describe Y2Autoinstallation::Widgets::Storage::FilesystemAttrs do subject(:widget) { described_class.new(section) } - let(:section) do - Y2Storage::AutoinstProfile::PartitionSection.new + let(:drive) { Y2Autoinstallation::Presenters::Drive.new(partitioning.drives.first) } + let(:section) { drive.partitions.first } + + let(:partitioning) do + Y2Storage::AutoinstProfile::PartitioningSection.new_from_hashes( + [ + { "type" => :CT_DISK, "partitions" => [{}] } + ] + ) end include_examples "CWM::CustomWidget" @@ -136,7 +144,8 @@ end it "includes fstab options" do - expect(widget.values).to include("fstab_options" => "ro,noatime,user") + # See bsc#1181577, the correct name in this hash is fstopt (not fstab_options) + expect(widget.values).to include("fstopt" => "ro,noatime,user") end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.3.65/test/lib/widgets/storage/partition_usage_tab_test.rb new/autoyast2-4.3.67/test/lib/widgets/storage/partition_usage_tab_test.rb --- old/autoyast2-4.3.65/test/lib/widgets/storage/partition_usage_tab_test.rb 2021-01-18 13:50:59.000000000 +0100 +++ new/autoyast2-4.3.67/test/lib/widgets/storage/partition_usage_tab_test.rb 2021-02-01 11:13:12.000000000 +0100 @@ -145,13 +145,14 @@ describe "#store" do it "sets section attributes related to its usage" do + # See bsc#1181577, the correct name in this hash is fstopt (not fstab_options) expect(partition).to receive(:update).with( hash_including( "filesystem", "label", "mount", "mountby", - "fstab_options", + "fstopt", "mkfs_options", "raid_name", "lvm_group",