Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2014-03-21 12:14:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2014-03-11 09:24:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2014-03-21 12:14:44.000000000 +0100 @@ -1,0 +2,24 @@ +Wed Mar 19 14:18:07 CET 2014 - aschn...@suse.de + +- removed "Import Partition Setup" button (bnc#868864) + +------------------------------------------------------------------- +Tue Mar 18 17:49:14 CET 2014 - aschn...@suse.de + +- fixed btrfs_increase_percentage handling in storage proposal +- version 3.1.14 + +------------------------------------------------------------------- +Tue Mar 11 15:29:18 CET 2014 - aschn...@suse.de + +- fixed creation of subvolume for /home (bnc#867604) +- version 3.1.13 + +------------------------------------------------------------------- +Tue Mar 11 10:59:04 CET 2014 - aschn...@suse.de + +- changed subvolume for rollback on S/390 (fate#316222 and + bnc#867270) +- version 3.1.12 + +------------------------------------------------------------------- Old: ---- yast2-storage-3.1.11.tar.bz2 New: ---- yast2-storage-3.1.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.jSiJhn/_old 2014-03-21 12:14:44.000000000 +0100 +++ /var/tmp/diff_new_pack.jSiJhn/_new 2014-03-21 12:14:44.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.11 +Version: 3.1.14 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,8 +26,8 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: gcc-c++ -BuildRequires: libstorage-devel >= 2.25.8 -BuildRequires: libstorage-ruby >= 2.25.8 +BuildRequires: libstorage-devel >= 2.25.10 +BuildRequires: libstorage-ruby >= 2.25.10 BuildRequires: libtool BuildRequires: libxslt BuildRequires: perl-XML-Writer @@ -40,8 +40,8 @@ BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-ruby-bindings >= 3.1.7 BuildRequires: yast2-testsuite >= 2.19.0 -Requires: libstorage-ruby >= 2.25.8 -Requires: libstorage5 >= 2.25.8 +Requires: libstorage-ruby >= 2.25.10 +Requires: libstorage5 >= 2.25.10 Requires: rubygem-ruby-dbus Requires: yast2 >= 2.19.4 Requires: yast2-core >= 2.18.3 ++++++ yast2-storage-3.1.11.tar.bz2 -> yast2-storage-3.1.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/package/yast2-storage.changes new/yast2-storage-3.1.14/package/yast2-storage.changes --- old/yast2-storage-3.1.11/package/yast2-storage.changes 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/package/yast2-storage.changes 2014-03-20 14:54:08.000000000 +0100 @@ -1,4 +1,28 @@ ------------------------------------------------------------------- +Wed Mar 19 14:18:07 CET 2014 - aschn...@suse.de + +- removed "Import Partition Setup" button (bnc#868864) + +------------------------------------------------------------------- +Tue Mar 18 17:49:14 CET 2014 - aschn...@suse.de + +- fixed btrfs_increase_percentage handling in storage proposal +- version 3.1.14 + +------------------------------------------------------------------- +Tue Mar 11 15:29:18 CET 2014 - aschn...@suse.de + +- fixed creation of subvolume for /home (bnc#867604) +- version 3.1.13 + +------------------------------------------------------------------- +Tue Mar 11 10:59:04 CET 2014 - aschn...@suse.de + +- changed subvolume for rollback on S/390 (fate#316222 and + bnc#867270) +- version 3.1.12 + +------------------------------------------------------------------- Thu Mar 06 17:25:31 CET 2014 - aschn...@suse.de - added subvolumes for customer data (fate#316981) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/package/yast2-storage.spec new/yast2-storage-3.1.14/package/yast2-storage.spec --- old/yast2-storage-3.1.11/package/yast2-storage.spec 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/package/yast2-storage.spec 2014-03-20 14:54:08.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.11 +Version: 3.1.14 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,17 +28,17 @@ BuildRequires: gcc-c++ libtool BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.25.8 +BuildRequires: libstorage-devel >= 2.25.10 BuildRequires: yast2 >= 2.19.4 BuildRequires: yast2-core-devel >= 2.23.1 BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-testsuite >= 2.19.0 BuildRequires: rubygem-ruby-dbus BuildRequires: rubygem-rspec -BuildRequires: libstorage-ruby >= 2.25.8 +BuildRequires: libstorage-ruby >= 2.25.10 BuildRequires: yast2-ruby-bindings >= 3.1.7 -Requires: libstorage5 >= 2.25.8 -Requires: libstorage-ruby >= 2.25.8 +Requires: libstorage5 >= 2.25.10 +Requires: libstorage-ruby >= 2.25.10 Requires: yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 Requires: rubygem-ruby-dbus %ifarch s390 s390x diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/src/clients/inst_disk_proposal.rb new/yast2-storage-3.1.14/src/clients/inst_disk_proposal.rb --- old/yast2-storage-3.1.11/src/clients/inst_disk_proposal.rb 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/src/clients/inst_disk_proposal.rb 2014-03-20 14:54:08.000000000 +0100 @@ -56,7 +56,6 @@ Yast.include self, "partitioning/custom_part_dialogs.rb" - Yast.include self, "partitioning/ep-import.rb" @targetMap = Storage.GetTargetMap @@ -79,8 +78,6 @@ @modify_str = _("&Edit Partition Setup...") # Radiobutton for partition dialog @detailed_str = _("&Create Partition Setup...") - # Radiobutton for partition dialog - @import_str = _("&Import Partition Setup...") @target_is = "" @@ -136,8 +133,6 @@ @bframe = VBox( PushButton(Id(:detailed), @detailed_str), VSpacing(0.2), - PushButton(Id(:import), @import_str), - VSpacing(0.2), PushButton(Id(:modify), @modify_str) ) @@ -182,19 +177,6 @@ ) # help text continued - # %1 is replaced by button text - help_text += - Builtins.sformat( - _( - "<p>\n" + - "To import the mount points from an existing Linux\n" + - "system choose <b>%1</b>. You can still make modification\n" + - "afterwards in the expert partitioner dialog.</p>\n" - ), - Builtins.deletechars(@import_str, "&") - ) - - # help text continued help_text += Builtins.sformat( _( @@ -260,7 +242,7 @@ @changes = Storage.ChangeText UI.ChangeWidget(Id(:richtext), :Value, @changes) end - elsif Builtins.contains([:modify, :detailed, :import], @ret) + elsif [:modify, :detailed].include?(@ret) Storage.SetPartProposalFirst(false) Storage.SetPartProposalActive(false) @@ -276,9 +258,6 @@ end Storage.SetPartDisk("") Storage.SetPartProposalMode("detailed") - when :import - @target_is = "PROP_MODIFY" - Storage.SetPartProposalMode("modify") end Storage.SetPartMode(@target_is) @@ -414,8 +393,6 @@ Wizard.OpenNextBackDialog result = Sequencer.Run(aliases, seq) Wizard.CloseDialog - when :import - ImportMountPoints() end Storage.HandleProposalPackages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/src/modules/Storage.rb new/yast2-storage-3.1.14/src/modules/Storage.rb --- old/yast2-storage-3.1.11/src/modules/Storage.rb 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/src/modules/Storage.rb 2014-03-20 14:54:08.000000000 +0100 @@ -4977,7 +4977,7 @@ end if Arch.s390 - def_subvol.push("boot/grub2/s390x") + def_subvol.push("boot/grub2/s390x-emu") end def_subvol.sort!() @@ -5929,7 +5929,7 @@ Builtins.foreach(target_map) do |k, e| need_lvm = true if Ops.get_symbol(e, "type", :CT_UNKNOWN) == :CT_LVM need_nfs = true if Ops.get_symbol(e, "type", :CT_UNKNOWN) == :CT_NFS - need_iscsi = true if Ops.get_boolean(e, "iscsi", :CT_UNKNOWN) == true + need_iscsi = true if e.fetch("iscsi", false) if Builtins.find(Ops.get_list(e, "partitions", [])) do |part2| FileSystems.HasQuota(part2) end != nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/src/modules/StorageProposal.rb new/yast2-storage-3.1.14/src/modules/StorageProposal.rb --- old/yast2-storage-3.1.11/src/modules/StorageProposal.rb 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/src/modules/StorageProposal.rb 2014-03-20 14:54:08.000000000 +0100 @@ -315,17 +315,7 @@ keys = ["home_limit", "root_max", "root_base", "home_max", "vm_want"] Builtins.foreach(keys) do |k| if Builtins.haskey(ret, k) - Ops.set( - ret, - k, - Ops.add( - Ops.get_integer(ret, k, 0), - Ops.divide( - Ops.multiply(Ops.get_integer(ret, k, 0), 100), - Ops.get_integer(@cfg_xml, "btrfs_increase_percentage", 0) - ) - ) - ) + ret[k] *= 1.0 + @cfg_xml["btrfs_increase_percentage"] / 100.0 else Builtins.y2warning("GetControlCfg no key:%1", k) end @@ -4396,10 +4386,21 @@ def post_process_partitions(partitions) + have_home_partition = false + + partitions.each do |volume| + + # check whether we have a home partition + if volume["mount"] == "/home" + have_home_partition = true + end + + end + partitions.each do |volume| # if we have a home volume remove the home subvolume - if PropDefaultFs() == :btrfs && GetProposalHome() + if PropDefaultFs() == :btrfs && have_home_partition if volume["mount"] == "/" if FileSystems.default_subvol.empty? home = "home" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/data/Makefile.am new/yast2-storage-3.1.14/testsuite/data/Makefile.am --- old/yast2-storage-3.1.11/testsuite/data/Makefile.am 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/data/Makefile.am 2014-03-20 14:54:08.000000000 +0100 @@ -3,5 +3,5 @@ # SUBDIRS = empty empty-efi half-empty reuse-home windows windows-only \ - windows-only-efi empty-s390x + windows-only-efi empty-s390x empty-ppc64le empty-small empty-big diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/data/empty-big/Makefile.am new/yast2-storage-3.1.14/testsuite/data/empty-big/Makefile.am --- old/yast2-storage-3.1.11/testsuite/data/empty-big/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/data/empty-big/Makefile.am 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,6 @@ +# +# Makefile.am for storage/storage/src/testsuite/data/empty-big +# + +EXTRA_DIST = disk_sda.info + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/data/empty-big/disk_sda.info new/yast2-storage-3.1.14/testsuite/data/empty-big/disk_sda.info --- old/yast2-storage-3.1.11/testsuite/data/empty-big/disk_sda.info 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/data/empty-big/disk_sda.info 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<disk> + <name>sda</name> + <device>/dev/sda</device> + <size_k>2684354560</size_k> + <major>8</major> + <minor>16</minor> + <range>256</range> + <geometry> + <cylinders>334186</cylinders> + <heads>255</heads> + <sectors>63</sectors> + </geometry> + <label>gpt</label> + <max_primary>128</max_primary> +</disk> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/data/empty-ppc64le/Makefile.am new/yast2-storage-3.1.14/testsuite/data/empty-ppc64le/Makefile.am --- old/yast2-storage-3.1.11/testsuite/data/empty-ppc64le/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/data/empty-ppc64le/Makefile.am 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,6 @@ +# +# Makefile.am for storage/storage/src/testsuite/data/empty-ppc64le +# + +EXTRA_DIST = disk_sda.info arch.info + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/data/empty-ppc64le/arch.info new/yast2-storage-3.1.14/testsuite/data/empty-ppc64le/arch.info --- old/yast2-storage-3.1.11/testsuite/data/empty-ppc64le/arch.info 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/data/empty-ppc64le/arch.info 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<arch> + <arch>ppc64le</arch> +</arch> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/data/empty-ppc64le/disk_sda.info new/yast2-storage-3.1.14/testsuite/data/empty-ppc64le/disk_sda.info --- old/yast2-storage-3.1.11/testsuite/data/empty-ppc64le/disk_sda.info 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/data/empty-ppc64le/disk_sda.info 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<disk> + <name>sda</name> + <device>/dev/sda</device> + <size_k>312571224</size_k> + <major>8</major> + <minor>0</minor> + <range>256</range> + <geometry> + <cylinders>38913</cylinders> + <heads>255</heads> + <sectors>63</sectors> + </geometry> + <label>msdos</label> + <max_primary>4</max_primary> + <ext_possible>true</ext_possible> + <max_logical>63</max_logical> +</disk> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/data/empty-small/Makefile.am new/yast2-storage-3.1.14/testsuite/data/empty-small/Makefile.am --- old/yast2-storage-3.1.11/testsuite/data/empty-small/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/data/empty-small/Makefile.am 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,6 @@ +# +# Makefile.am for storage/storage/src/testsuite/data/empty-small +# + +EXTRA_DIST = disk_sda.info + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/data/empty-small/disk_sda.info new/yast2-storage-3.1.14/testsuite/data/empty-small/disk_sda.info --- old/yast2-storage-3.1.11/testsuite/data/empty-small/disk_sda.info 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/data/empty-small/disk_sda.info 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<disk> + <name>sda</name> + <device>/dev/sda</device> + <size_k>4194304</size_k> + <major>8</major> + <minor>0</minor> + <range>256</range> + <geometry> + <cylinders>522</cylinders> + <heads>255</heads> + <sectors>63</sectors> + </geometry> + <label>msdos</label> + <max_primary>4</max_primary> + <ext_possible>true</ext_possible> + <max_logical>255</max_logical> + <udev_path>pci-0000:00:1f.2-scsi-1:0:0:0</udev_path> + <udev_id>scsi-0ATA_VBOX_HARDDISK_VBb498d3ee-913398cb</udev_id> + <udev_id>scsi-1ATA_VBOX_HARDDISK_VBb498d3ee-913398cb</udev_id> + <transport>SATA</transport> +</disk> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty-big1.out new/yast2-storage-3.1.14/testsuite/tests/empty-big1.out --- old/yast2-storage-3.1.11/testsuite/tests/empty-big1.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty-big1.out 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,24 @@ +Dump Proposal: +Dump Create BIOS grub volume /dev/sda1 (7.84 MiB) +Dump Create swap volume /dev/sda2 (517.72 MiB) +Dump Create root volume /dev/sda3 (2.50 TiB) with btrfs +Dump Create subvolume boot/grub2/i386-pc on device /dev/sda3 +Dump Create subvolume home on device /dev/sda3 +Dump Create subvolume opt on device /dev/sda3 +Dump Create subvolume srv on device /dev/sda3 +Dump Create subvolume tmp on device /dev/sda3 +Dump Create subvolume usr/local on device /dev/sda3 +Dump Create subvolume var/crash on device /dev/sda3 +Dump Create subvolume var/lib/mailman on device /dev/sda3 +Dump Create subvolume var/lib/named on device /dev/sda3 +Dump Create subvolume var/lib/pgqsl on device /dev/sda3 +Dump Create subvolume var/log on device /dev/sda3 +Dump Create subvolume var/opt on device /dev/sda3 +Dump Create subvolume var/spool on device /dev/sda3 +Dump Create subvolume var/tmp on device /dev/sda3 +Dump +Dump Target Map Excerpt: +Dump device:/dev/sda label:gpt +Dump device:/dev/sda1 fsid:0x107 +Dump device:/dev/sda2 fsid:0x82 +Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty-big1.rb new/yast2-storage-3.1.14/testsuite/tests/empty-big1.rb --- old/yast2-storage-3.1.11/testsuite/tests/empty-big1.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty-big1.rb 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,30 @@ +# encoding: utf-8 + +# testedfiles: helper1b.yh +module Yast + class Empty1Client < Client + + def main + Yast.include self, "setup-system.rb" + + setup_system("empty-big") + + Yast.include self, "helper1a.rb" + + Yast.import "ProductFeatures" + + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + + Yast.include self, "helper1b.rb" + + nil + end + + end +end + +Yast::Empty1Client.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty-efi1.out new/yast2-storage-3.1.14/testsuite/tests/empty-efi1.out --- old/yast2-storage-3.1.11/testsuite/tests/empty-efi1.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty-efi1.out 2014-03-20 14:54:08.000000000 +0100 @@ -18,4 +18,8 @@ Dump Create subvolume var/spool on device /dev/sda3 Dump Create subvolume var/tmp on device /dev/sda3 Dump -Dump Extra Data: +Dump Target Map Excerpt: +Dump device:/dev/sda label:gpt +Dump device:/dev/sda1 fsid:0x103 +Dump device:/dev/sda2 fsid:0x82 +Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty-efi2.out new/yast2-storage-3.1.14/testsuite/tests/empty-efi2.out --- old/yast2-storage-3.1.11/testsuite/tests/empty-efi2.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty-efi2.out 2014-03-20 14:54:08.000000000 +0100 @@ -18,4 +18,9 @@ Dump Create subvolume var/spool on device /dev/sda3 Dump Create subvolume var/tmp on device /dev/sda3 Dump -Dump Extra Data: +Dump Target Map Excerpt: +Dump device:/dev/sda label:gpt +Dump device:/dev/sda1 fsid:0x103 +Dump device:/dev/sda2 fsid:0x82 +Dump device:/dev/sda3 fsid:0x83 +Dump device:/dev/sda4 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty-ppc64le1.out new/yast2-storage-3.1.14/testsuite/tests/empty-ppc64le1.out --- old/yast2-storage-3.1.11/testsuite/tests/empty-ppc64le1.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty-ppc64le1.out 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,24 @@ +Dump Proposal: +Dump Create PPC PReP volume /dev/sda1 (203.95 MiB) +Dump Create swap volume /dev/sda2 (517.72 MiB) +Dump Create root volume /dev/sda3 (297.38 GiB) with btrfs +Dump Create subvolume boot/grub2/power-ieee1275 on device /dev/sda3 +Dump Create subvolume home on device /dev/sda3 +Dump Create subvolume opt on device /dev/sda3 +Dump Create subvolume srv on device /dev/sda3 +Dump Create subvolume tmp on device /dev/sda3 +Dump Create subvolume usr/local on device /dev/sda3 +Dump Create subvolume var/crash on device /dev/sda3 +Dump Create subvolume var/lib/mailman on device /dev/sda3 +Dump Create subvolume var/lib/named on device /dev/sda3 +Dump Create subvolume var/lib/pgqsl on device /dev/sda3 +Dump Create subvolume var/log on device /dev/sda3 +Dump Create subvolume var/opt on device /dev/sda3 +Dump Create subvolume var/spool on device /dev/sda3 +Dump Create subvolume var/tmp on device /dev/sda3 +Dump +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x41 +Dump device:/dev/sda2 fsid:0x82 +Dump device:/dev/sda3 fsid:0x83 userdata:{"/"=>"snapshots"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty-ppc64le1.rb new/yast2-storage-3.1.14/testsuite/tests/empty-ppc64le1.rb --- old/yast2-storage-3.1.11/testsuite/tests/empty-ppc64le1.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty-ppc64le1.rb 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,30 @@ +# encoding: utf-8 + +# testedfiles: helper1b.yh +module Yast + class Empty1Client < Client + + def main + Yast.include self, "setup-system.rb" + + setup_system("empty-ppc64le") + + Yast.include self, "helper1a.rb" + + Yast.import "ProductFeatures" + + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + + Yast.include self, "helper1b.rb" + + nil + end + + end +end + +Yast::Empty1Client.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty-s390x1.out new/yast2-storage-3.1.14/testsuite/tests/empty-s390x1.out --- old/yast2-storage-3.1.11/testsuite/tests/empty-s390x1.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty-s390x1.out 2014-03-20 14:54:08.000000000 +0100 @@ -2,7 +2,7 @@ Dump Create volume /dev/sda1 (203.95 MiB) for /boot/zipl with ext2 Dump Create swap volume /dev/sda2 (517.72 MiB) Dump Create root volume /dev/sda3 (297.38 GiB) with btrfs -Dump Create subvolume boot/grub2/s390x on device /dev/sda3 +Dump Create subvolume boot/grub2/s390x-emu on device /dev/sda3 Dump Create subvolume home on device /dev/sda3 Dump Create subvolume opt on device /dev/sda3 Dump Create subvolume srv on device /dev/sda3 @@ -17,5 +17,8 @@ Dump Create subvolume var/spool on device /dev/sda3 Dump Create subvolume var/tmp on device /dev/sda3 Dump -Dump Extra Data: -Dump device:/dev/sda3 userdata:{"/"=>"snapshots"} +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x83 +Dump device:/dev/sda2 fsid:0x82 +Dump device:/dev/sda3 fsid:0x83 userdata:{"/"=>"snapshots"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty-small1.out new/yast2-storage-3.1.14/testsuite/tests/empty-small1.out --- old/yast2-storage-3.1.11/testsuite/tests/empty-small1.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty-small1.out 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,22 @@ +Dump Proposal: +Dump Create swap volume /dev/sda1 (517.72 MiB) +Dump Create root volume /dev/sda2 (3.49 GiB) with btrfs +Dump Create subvolume boot/grub2/i386-pc on device /dev/sda2 +Dump Create subvolume home on device /dev/sda2 +Dump Create subvolume opt on device /dev/sda2 +Dump Create subvolume srv on device /dev/sda2 +Dump Create subvolume tmp on device /dev/sda2 +Dump Create subvolume usr/local on device /dev/sda2 +Dump Create subvolume var/crash on device /dev/sda2 +Dump Create subvolume var/lib/mailman on device /dev/sda2 +Dump Create subvolume var/lib/named on device /dev/sda2 +Dump Create subvolume var/lib/pgqsl on device /dev/sda2 +Dump Create subvolume var/log on device /dev/sda2 +Dump Create subvolume var/opt on device /dev/sda2 +Dump Create subvolume var/spool on device /dev/sda2 +Dump Create subvolume var/tmp on device /dev/sda2 +Dump +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x82 +Dump device:/dev/sda2 fsid:0x83 userdata:{"/"=>"snapshots"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty-small1.rb new/yast2-storage-3.1.14/testsuite/tests/empty-small1.rb --- old/yast2-storage-3.1.11/testsuite/tests/empty-small1.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty-small1.rb 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,29 @@ +# encoding: utf-8 + +# testedfiles: helper1b.yh +module Yast + class Empty1Client < Client + + def main + Yast.include self, "setup-system.rb" + + setup_system("empty-small") + + Yast.include self, "helper1a.rb" + + Yast.import "ProductFeatures" + + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "10 GB") + + Yast.include self, "helper1b.rb" + + nil + end + + end +end + +Yast::Empty1Client.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty1.out new/yast2-storage-3.1.14/testsuite/tests/empty1.out --- old/yast2-storage-3.1.11/testsuite/tests/empty1.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty1.out 2014-03-20 14:54:08.000000000 +0100 @@ -16,4 +16,7 @@ Dump Create subvolume var/spool on device /dev/sda2 Dump Create subvolume var/tmp on device /dev/sda2 Dump -Dump Extra Data: +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x82 +Dump device:/dev/sda2 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty2.out new/yast2-storage-3.1.14/testsuite/tests/empty2.out --- old/yast2-storage-3.1.11/testsuite/tests/empty2.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty2.out 2014-03-20 14:54:08.000000000 +0100 @@ -16,5 +16,8 @@ Dump Create subvolume var/spool on device /dev/sda2 Dump Create subvolume var/tmp on device /dev/sda2 Dump -Dump Extra Data: -Dump device:/dev/sda2 userdata:{"/"=>"snapshots"} +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x82 +Dump device:/dev/sda2 fsid:0x83 userdata:{"/"=>"snapshots"} +Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty3.out new/yast2-storage-3.1.14/testsuite/tests/empty3.out --- old/yast2-storage-3.1.11/testsuite/tests/empty3.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty3.out 2014-03-20 14:54:08.000000000 +0100 @@ -19,4 +19,9 @@ Dump Create subvolume var/spool on device /dev/system/root Dump Create subvolume var/tmp on device /dev/system/root Dump -Dump Extra Data: +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x83 +Dump device:/dev/sda2 fsid:0x8e +Dump device:/dev/system/root +Dump device:/dev/system/swap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty4.out new/yast2-storage-3.1.14/testsuite/tests/empty4.out --- old/yast2-storage-3.1.11/testsuite/tests/empty4.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty4.out 2014-03-20 14:54:08.000000000 +0100 @@ -20,4 +20,10 @@ Dump Create subvolume var/spool on device /dev/system/root Dump Create subvolume var/tmp on device /dev/system/root Dump -Dump Extra Data: +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x83 +Dump device:/dev/sda2 fsid:0x8e +Dump device:/dev/system/root +Dump device:/dev/system/swap +Dump device:/dev/system/home diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty5.out new/yast2-storage-3.1.14/testsuite/tests/empty5.out --- old/yast2-storage-3.1.11/testsuite/tests/empty5.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty5.out 2014-03-20 14:54:08.000000000 +0100 @@ -19,4 +19,9 @@ Dump Create subvolume var/spool on device /dev/system/root Dump Create subvolume var/tmp on device /dev/system/root Dump -Dump Extra Data: +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x83 +Dump device:/dev/sda2 fsid:0x8e +Dump device:/dev/system/root +Dump device:/dev/system/swap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty6.out new/yast2-storage-3.1.14/testsuite/tests/empty6.out --- old/yast2-storage-3.1.11/testsuite/tests/empty6.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty6.out 2014-03-20 14:54:08.000000000 +0100 @@ -20,4 +20,10 @@ Dump Create subvolume var/spool on device /dev/system/root Dump Create subvolume var/tmp on device /dev/system/root Dump -Dump Extra Data: +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x83 +Dump device:/dev/sda2 fsid:0x8e +Dump device:/dev/system/root +Dump device:/dev/system/swap +Dump device:/dev/system/home diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty7.out new/yast2-storage-3.1.14/testsuite/tests/empty7.out --- old/yast2-storage-3.1.11/testsuite/tests/empty7.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty7.out 2014-03-20 14:54:08.000000000 +0100 @@ -16,5 +16,8 @@ Dump Create subvolume var/spool on device /dev/sda2 Dump Create subvolume var/tmp on device /dev/sda2 Dump -Dump Extra Data: -Dump device:/dev/sda2 userdata:{"/"=>"snapshots"} +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x82 +Dump device:/dev/sda2 fsid:0x83 userdata:{"/"=>"snapshots"} +Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty8.out new/yast2-storage-3.1.14/testsuite/tests/empty8.out --- old/yast2-storage-3.1.11/testsuite/tests/empty8.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty8.out 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,23 @@ +Dump Proposal: +Dump Create swap volume /dev/sda1 (2.01 GiB) +Dump Create root volume /dev/sda2 (40.00 GiB) with btrfs +Dump Create volume /dev/sda3 (256.08 GiB) for /home with xfs +Dump Create subvolume boot/grub2/i386-pc on device /dev/sda2 +Dump Create subvolume opt on device /dev/sda2 +Dump Create subvolume srv on device /dev/sda2 +Dump Create subvolume tmp on device /dev/sda2 +Dump Create subvolume usr/local on device /dev/sda2 +Dump Create subvolume var/crash on device /dev/sda2 +Dump Create subvolume var/lib/mailman on device /dev/sda2 +Dump Create subvolume var/lib/named on device /dev/sda2 +Dump Create subvolume var/lib/pgqsl on device /dev/sda2 +Dump Create subvolume var/log on device /dev/sda2 +Dump Create subvolume var/opt on device /dev/sda2 +Dump Create subvolume var/spool on device /dev/sda2 +Dump Create subvolume var/tmp on device /dev/sda2 +Dump +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x82 +Dump device:/dev/sda2 fsid:0x83 userdata:{"/"=>"snapshots"} +Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/empty8.rb new/yast2-storage-3.1.14/testsuite/tests/empty8.rb --- old/yast2-storage-3.1.11/testsuite/tests/empty8.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/empty8.rb 2014-03-20 14:54:08.000000000 +0100 @@ -0,0 +1,32 @@ +# encoding: utf-8 + +# testedfiles: helper1b.yh +module Yast + class Empty1Client < Client + + def main + Yast.include self, "setup-system.rb" + + setup_system("empty") + + Yast.include self, "helper1a.rb" + + Yast.import "ProductFeatures" + + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "3 GB") + ProductFeatures.SetStringFeature("partitioning", "root_max_size", "10 GB") + ProductFeatures.SetIntegerFeature("partitioning", "btrfs_increase_percentage", 300) + + Yast.include self, "helper1b.rb" + + nil + end + + end +end + +Yast::Empty1Client.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/half-empty1.out new/yast2-storage-3.1.14/testsuite/tests/half-empty1.out --- old/yast2-storage-3.1.11/testsuite/tests/half-empty1.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/half-empty1.out 2014-03-20 14:54:08.000000000 +0100 @@ -17,4 +17,11 @@ Dump Create subvolume var/spool on device /dev/sda6 Dump Create subvolume var/tmp on device /dev/sda6 Dump -Dump Extra Data: +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x83 +Dump device:/dev/sda2 fsid:0x8e +Dump device:/dev/sda3 fsid:0xf +Dump device:/dev/sda5 fsid:0x82 +Dump device:/dev/sda6 fsid:0x83 +Dump device:/dev/sda7 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/helper1a.rb new/yast2-storage-3.1.14/testsuite/tests/helper1a.rb --- old/yast2-storage-3.1.11/testsuite/tests/helper1a.rb 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/helper1a.rb 2014-03-20 14:54:08.000000000 +0100 @@ -11,8 +11,9 @@ @READ = { "probe" => { "architecture" => "i386", - "bios" => [{ "lba_support" => true }], - "cdrom" => [] + "bios" => [ { "lba_support" => true } ], + "cdrom" => [], + "system" => [ { "system" => "" } ] }, "proc" => { "swaps" => [], @@ -35,10 +36,16 @@ file = File.new("tmp/arch.info") doc = REXML::Document.new(file) arch = doc.elements["arch"].elements["arch"].text + system = "" if arch == "s390x" arch = "s390_64" end + if arch == "ppc64le" + arch = "ppc64" + system = "CHRP" + end @READ["probe"]["architecture"] = arch + @READ["probe"]["system"][0]["system"] = system rescue Errno::ENOENT end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/helper1b.rb new/yast2-storage-3.1.14/testsuite/tests/helper1b.rb --- old/yast2-storage-3.1.11/testsuite/tests/helper1b.rb 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/helper1b.rb 2014-03-20 14:54:08.000000000 +0100 @@ -31,13 +31,37 @@ Testsuite.Dump("") - Testsuite.Dump("Extra Data:") + Testsuite.Dump("Target Map Excerpt:") prop["target"].each do |device, container| + + if Storage.IsDiskType(container.fetch("type", :CT_UNKNOWN)) + + line = "device:#{container["device"]}" + + if container.fetch("label", "") != "" + line << " label:#{container["label"]}" + end + + Testsuite.Dump(line) + + end + container["partitions"].each do |volume| + + line = "device:#{volume["device"]}" + + if volume.fetch("fsid", 0) != 0 + line << " fsid:0x#{volume["fsid"].to_s(16)}" + end + if !volume.fetch("userdata", {}).empty? - Testsuite.Dump("device:#{volume["device"]} userdata:#{volume["userdata"]}") + line << " userdata:#{volume["userdata"]}" end + + Testsuite.Dump(line) + end + end else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/reuse-home1.out new/yast2-storage-3.1.14/testsuite/tests/reuse-home1.out --- old/yast2-storage-3.1.11/testsuite/tests/reuse-home1.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/reuse-home1.out 2014-03-20 14:54:08.000000000 +0100 @@ -16,4 +16,8 @@ Dump Use /dev/sda1 as swap Dump Set mount point of /dev/sda3 to /home Dump -Dump Extra Data: +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x82 +Dump device:/dev/sda2 fsid:0x83 +Dump device:/dev/sda3 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/windows-only-efi1.out new/yast2-storage-3.1.14/testsuite/tests/windows-only-efi1.out --- old/yast2-storage-3.1.11/testsuite/tests/windows-only-efi1.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/windows-only-efi1.out 2014-03-20 14:54:08.000000000 +0100 @@ -4,6 +4,7 @@ Dump Create root volume /dev/sda4 (7.62 GiB) with btrfs Dump Create subvolume boot/grub2/i386-pc on device /dev/sda4 Dump Create subvolume boot/grub2/x86_64-efi on device /dev/sda4 +Dump Create subvolume home on device /dev/sda4 Dump Create subvolume opt on device /dev/sda4 Dump Create subvolume srv on device /dev/sda4 Dump Create subvolume tmp on device /dev/sda4 @@ -18,4 +19,9 @@ Dump Create subvolume var/tmp on device /dev/sda4 Dump Set mount point of /dev/sda1 to /boot/efi Dump -Dump Extra Data: +Dump Target Map Excerpt: +Dump device:/dev/sda label:gpt +Dump device:/dev/sda1 fsid:0x103 +Dump device:/dev/sda2 fsid:0x7 +Dump device:/dev/sda3 fsid:0x82 +Dump device:/dev/sda4 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/windows-only1.out new/yast2-storage-3.1.14/testsuite/tests/windows-only1.out --- old/yast2-storage-3.1.11/testsuite/tests/windows-only1.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/windows-only1.out 2014-03-20 14:54:08.000000000 +0100 @@ -18,4 +18,10 @@ Dump Create subvolume var/spool on device /dev/sda6 Dump Create subvolume var/tmp on device /dev/sda6 Dump -Dump Extra Data: +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x7 +Dump device:/dev/sda2 fsid:0xf +Dump device:/dev/sda5 fsid:0x82 +Dump device:/dev/sda6 fsid:0x83 +Dump device:/dev/sda7 fsid:0x83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.11/testsuite/tests/windows1.out new/yast2-storage-3.1.14/testsuite/tests/windows1.out --- old/yast2-storage-3.1.11/testsuite/tests/windows1.out 2014-03-07 10:54:25.000000000 +0100 +++ new/yast2-storage-3.1.14/testsuite/tests/windows1.out 2014-03-20 14:54:08.000000000 +0100 @@ -17,4 +17,10 @@ Dump Create subvolume var/spool on device /dev/sda6 Dump Create subvolume var/tmp on device /dev/sda6 Dump -Dump Extra Data: +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 fsid:0x7 +Dump device:/dev/sda2 fsid:0xf +Dump device:/dev/sda5 fsid:0x82 +Dump device:/dev/sda6 fsid:0x83 +Dump device:/dev/sda7 fsid:0x83 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org