Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2013-12-05 07:18:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-11-28 19:10:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2013-12-05 07:18:31.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Dec 03 17:40:26 CET 2013 - [email protected] + +- import complete used-by list from libstorage in target-map + +------------------------------------------------------------------- +Mon Dec 02 14:00:23 CET 2013 - [email protected] + +- change default filesystem to btrfs (fate#315901) +- change default filesystem for /home to xfs (fate#316637) + +------------------------------------------------------------------- Old: ---- yast2-storage-3.1.2.tar.bz2 New: ---- yast2-storage-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.T4yeJk/_old 2013-12-05 07:18:31.000000000 +0100 +++ /var/tmp/diff_new_pack.T4yeJk/_new 2013-12-05 07:18:31.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.2 +Version: 3.1.3 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.3 -BuildRequires: libstorage-ruby >= 2.25.2 +BuildRequires: libstorage-devel >= 2.25.4 +BuildRequires: libstorage-ruby >= 2.25.4 BuildRequires: libtool BuildRequires: libxslt BuildRequires: perl-XML-Writer @@ -38,8 +38,8 @@ BuildRequires: yast2-core-devel >= 2.23.1 BuildRequires: yast2-devtools >= 3.0.6 BuildRequires: yast2-testsuite >= 2.19.0 -Requires: libstorage-ruby >= 2.25.2 -Requires: libstorage4 >= 2.25.2 +Requires: libstorage-ruby >= 2.25.4 +Requires: libstorage5 >= 2.25.4 Requires: rubygem-ruby-dbus Requires: yast2 >= 2.19.4 Requires: yast2-core >= 2.18.3 ++++++ yast2-storage-3.1.2.tar.bz2 -> yast2-storage-3.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/VERSION new/yast2-storage-3.1.3/VERSION --- old/yast2-storage-3.1.2/VERSION 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/VERSION 2013-12-04 10:21:37.000000000 +0100 @@ -1 +1 @@ -3.1.2 +3.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/package/yast2-storage.changes new/yast2-storage-3.1.3/package/yast2-storage.changes --- old/yast2-storage-3.1.2/package/yast2-storage.changes 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/package/yast2-storage.changes 2013-12-04 10:21:37.000000000 +0100 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Tue Dec 03 17:40:26 CET 2013 - [email protected] + +- import complete used-by list from libstorage in target-map + +------------------------------------------------------------------- +Mon Dec 02 14:00:23 CET 2013 - [email protected] + +- change default filesystem to btrfs (fate#315901) +- change default filesystem for /home to xfs (fate#316637) + +------------------------------------------------------------------- Tue Nov 26 15:11:04 CET 2013 - [email protected] - disable btrfs multivolume support (bnc#832196) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/package/yast2-storage.spec new/yast2-storage-3.1.3/package/yast2-storage.spec --- old/yast2-storage-3.1.2/package/yast2-storage.spec 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/package/yast2-storage.spec 2013-12-04 10:21:37.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.2 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,15 +28,15 @@ BuildRequires: gcc-c++ libtool BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.25.3 +BuildRequires: libstorage-devel >= 2.25.4 BuildRequires: yast2 >= 2.19.4 BuildRequires: yast2-core-devel >= 2.23.1 BuildRequires: yast2-devtools >= 3.0.6 BuildRequires: yast2-testsuite >= 2.19.0 BuildRequires: rubygem-ruby-dbus -BuildRequires: libstorage-ruby >= 2.25.2 -Requires: libstorage4 >= 2.25.2 -Requires: libstorage-ruby >= 2.25.2 +BuildRequires: libstorage-ruby >= 2.25.4 +Requires: libstorage5 >= 2.25.4 +Requires: libstorage-ruby >= 2.25.4 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.2/src/clients/inst_disk_proposal.rb new/yast2-storage-3.1.3/src/clients/inst_disk_proposal.rb --- old/yast2-storage-3.1.2/src/clients/inst_disk_proposal.rb 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/src/clients/inst_disk_proposal.rb 2013-12-04 10:21:37.000000000 +0100 @@ -250,7 +250,7 @@ return :abort if @ret == :abort && Popup.ReallyAbort(true) - if Builtins.contains([:lvm, :home, :btrfs, :encrypt, :suspend], @ret) + if StorageProposal.IsCommonWidget(@ret) @val = Convert.to_boolean(UI.QueryWidget(Id(@ret), :Value)) if AskOverwriteChanges() @target_is = "SUGGESTION" @@ -311,22 +311,10 @@ @val = StorageProposal.GetProposalLvm UI.ChangeWidget(Id(:lvm), :Value, @val) UI.ChangeWidget(Id(:encrypt), :Enabled, @val) - UI.ChangeWidget( - Id(:encrypt), - :Value, - @val && StorageProposal.GetProposalEncrypt - ) + UI.ChangeWidget(Id(:encrypt), :Value, @val && StorageProposal.GetProposalEncrypt) UI.ChangeWidget(Id(:home), :Value, StorageProposal.GetProposalHome) - UI.ChangeWidget( - Id(:btrfs), - :Value, - StorageProposal.GetProposalBtrfs - ) - UI.ChangeWidget( - Id(:suspend), - :Value, - StorageProposal.GetProposalSuspend - ) + UI.ChangeWidget(Id(:snapshots), :Value, StorageProposal.GetProposalSnapshots()) + UI.ChangeWidget(Id(:suspend), :Value, StorageProposal.GetProposalSuspend) UI.ChangeWidget(Id(:suspend), :Enabled, EnableSuspend()) end end until @ret == :next || @ret == :back || @ret == :cancel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/src/clients/inst_target_part.rb new/yast2-storage-3.1.3/src/clients/inst_target_part.rb --- old/yast2-storage-3.1.2/src/clients/inst_target_part.rb 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/src/clients/inst_target_part.rb 2013-12-04 10:21:37.000000000 +0100 @@ -237,7 +237,7 @@ if @ret == :abort && Popup.ReallyAbort(true) break - elsif Builtins.contains([:lvm, :home, :btrfs, :encrypt, :suspend], @ret) + elsif StorageProposal.IsCommonWidget(@ret) StorageProposal.HandleCommonWidgets(@ret) elsif @ret == :full # Set all checkboxes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/src/include/partitioning/auto_part_create.rb new/yast2-storage-3.1.3/src/include/partitioning/auto_part_create.rb --- old/yast2-storage-3.1.2/src/include/partitioning/auto_part_create.rb 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/src/include/partitioning/auto_part_create.rb 2013-12-04 10:21:37.000000000 +0100 @@ -102,7 +102,7 @@ Builtins.y2milestone("create_partitions keep %1", keep) if keep != nil && Ops.greater_than(Builtins.size(r), 0) && !StorageProposal.GetProposalHome && - !StorageProposal.GetProposalBtrfs && + !StorageProposal.GetProposalSnapshots && num_del_exist == 1 && num_del_free == 0 Builtins.y2milestone("create_partitions single special") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/src/modules/Partitions.rb new/yast2-storage-3.1.3/src/modules/Partitions.rb --- old/yast2-storage-3.1.2/src/modules/Partitions.rb 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/src/modules/Partitions.rb 2013-12-04 10:21:37.000000000 +0100 @@ -117,7 +117,7 @@ @default_fs = :unknown @default_boot_fs = :unknown - + @default_home_fs = :xfs @sint = nil @@ -189,6 +189,16 @@ end + def DefaultHomeFs() + @default_home_fs + end + + + def SetDefaultHomeFs(new_default_home_fs) + @default_home_fs = new_default_home_fs + end + + def BootMount if @boot_mount_point == "" @boot_mount_point = "/boot" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/src/modules/Storage.rb new/yast2-storage-3.1.3/src/modules/Storage.rb --- old/yast2-storage-3.1.2/src/modules/Storage.rb 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/src/modules/Storage.rb 2013-12-04 10:21:37.000000000 +0100 @@ -1262,9 +1262,7 @@ t = dinfo.transport Ops.set(d, "transport", toSymbol(@conv_transport, t)) - - bt = dinfo.iscsi - if bt + if t == ::Storage::ISCSI Ops.set(d, "iscsi", true) elsif Builtins.haskey(d, "iscsi") d = Builtins.remove(d, "iscsi") @@ -1291,13 +1289,37 @@ d = deep_copy(d) dinfo = infos.d d = diskMap(dinfo, d) - ls = Builtins.splitstring(infos.devices, " ") + ls = [] + infos.devices.each { |device| ls.push(device) } Ops.set(d, "devices", ls) Ops.set(d, "minor", infos.minor) Builtins.y2milestone("dmPartCoMap ret:%1", d) deep_copy(d) end + + def usedbyMap(d) + + tmp = [] + d.usedBy.each do |used_by| + tmp.push({ "type" => toSymbol(@conv_usedby, used_by.type), "device" => used_by.device }) + end + + ret = { "used_by" => tmp } + + if tmp.empty? + ret["used_by_type"] = :UB_NONE + ret["used_by_device"] = "" + else + ret["used_by_type"] = tmp[0]["type"] + ret["used_by_device"] = tmp[0]["device"] + end + + return ret + + end + + def volumeMap(vinfo, p) p = deep_copy(p) Ops.set(p, "device", vinfo.device) @@ -1317,21 +1339,9 @@ Ops.set(p, "inactive", true) if !vinfo.is_mounted Ops.set(p, "mountby", toSymbol(@conv_mountby, vinfo.mount_by)) end - t = vinfo.usedByType - if t != ::Storage::UB_NONE - Ops.set(p, "used_by_type", toSymbol(@conv_usedby, t)) - Ops.set(p, "used_by_device", vinfo.usedByDevice) - Ops.set( - p, - "used_by", - [ - { - "type" => Ops.get_symbol(p, "used_by_type", :UB_NONE), - "device" => Ops.get_string(p, "used_by_device", "") - } - ] - ) - end + + p.merge!(usedbyMap(vinfo)) + tmp = vinfo.fstab_options if !Builtins.isempty(tmp) Ops.set(p, "fstopt", tmp) @@ -1390,16 +1400,18 @@ tmp = vinfo.loop Ops.set(p, "loop", tmp) if !Builtins.isempty(tmp) - tmp = vinfo.udevPath - Ops.set(p, "udev_path", tmp) if !Builtins.isempty(tmp) - tmp = vinfo.udevId - if !Builtins.isempty(tmp) - Ops.set(p, "udev_id", Builtins.splitstring(tmp, " ")) + p["udev_path"] = vinfo.udevPath if !vinfo.udevPath.empty? + + if !vinfo.udevId.empty? + tmp = [] + vinfo.udevId.each { |udev_id| tmp.push(udev_id) } + p["udev_id"] = tmp end deep_copy(p) end + def partAddMap(info, p) p = deep_copy(p) Ops.set(p, "nr", info.nr) @@ -1578,10 +1590,12 @@ ) end - ls = Builtins.splitstring(infos.devices, " ") + ls = [] + infos.devices.each { |device| ls.push(device) } Ops.set(c, "devices", ls) - ls = Builtins.splitstring(infos.spares, " ") + ls = [] + infos.spares.each { |spare| ls.push(spare) } Ops.set(c, "spares", ls) if !Builtins.isempty(ls) t2 = infos.type @@ -1631,14 +1645,17 @@ Ops.set(c, "cyl_count", infos.peCount) Ops.set(c, "pe_free", infos.peFree) Ops.set(c, "lvm2", infos.lvm2) - ls = Builtins.splitstring(infos.devices, " ") + ls = [] + infos.devices.each { |device| ls.push(device) } Builtins.y2milestone("ls=%1", ls) Ops.set(c, "devices", ls) - ls = Builtins.splitstring(infos.devices_add, " ") + ls = [] + infos.devices_add.each { |device_add| ls.push(device_add) } if !Builtins.isempty(ls) Ops.set(c, "devices_add", ls) end - ls = Builtins.splitstring(infos.devices_rem, " ") + ls = [] + infos.devices_rem.each { |device_rem| ls.push(device_rem) } if !Builtins.isempty(ls) Ops.set(c, "devices_rem", ls) end @@ -1704,9 +1721,11 @@ Ops.set(p, "chunk_size", t2) if t2>0 Ops.set(p, "sb_ver", info.sb_ver) Ops.set(p, "raid_inactive", true) if info.inactive - ls = Builtins.splitstring(info.devices, " ") + ls = [] + info.devices.each { |device| ls.push(device) } Ops.set(p, "devices", ls) - ls = Builtins.splitstring(info.spares, " ") + ls = [] + info.spares.each { |spare| ls.push(spare) } Ops.set(p, "spares", ls) if !Builtins.isempty(ls) Ops.set( c, @@ -1784,19 +1803,23 @@ p = volumeMap(vinfo, p) Ops.set(p, "type", :btrfs) Ops.set(p, "fstype", Partitions.btrfs_name) - ls = Builtins.splitstring(info.devices, "\n") + ls = [] + info.devices.each { |device| ls.push(device) } Ops.set(p, "devices", ls) - ls = Builtins.splitstring(info.devices_add, "\n") + ls = [] + info.devices_add.each { |device_add| ls.push(device_add) } if !Builtins.isempty(ls) Ops.set(c, "devices_add", ls) end - ls = Builtins.splitstring(info.devices_rem, "\n") + ls = [] + info.devices_rem.each { |device_rem| ls.push(device_rem) } if !Builtins.isempty(ls) Ops.set(c, "devices_rem", ls) end li = [] Ops.set(p, "subvol", li) - ls = Builtins.splitstring(info.subvol, "\n") + ls = [] + info.subvol.each { |subvol| ls.push(subvol) } if !Builtins.isempty(ls) li = Builtins.maplist(ls) do |s| m = { "name" => s } @@ -1805,7 +1828,8 @@ Ops.set(p, "subvol", li) Builtins.y2milestone("subvol:%1", Ops.get_list(p, "subvol", [])) end - ls = Builtins.splitstring(info.subvol_add, "\n") + ls = [] + info.subvol_add.each { |subvol_add| ls.push(subvol_add) } if !Builtins.isempty(ls) li = Builtins.maplist(ls) do |s| m = { "create" => true, "name" => s } @@ -1818,7 +1842,8 @@ ) Builtins.y2milestone("subvol:%1", Ops.get_list(p, "subvol", [])) end - ls = Builtins.splitstring(info.subvol_rem, "\n") + ls = [] + info.subvol_rem.each { |subvol_rem| ls.push(subvol_rem) } if !Builtins.isempty(ls) li = Builtins.maplist(ls) do |s| m = { "delete" => true, "name" => s } @@ -1909,6 +1934,8 @@ end deep_copy(disk) end + + def getContainers ret = [] cinfos = ::Storage::DequeContainerInfo.new() @@ -1919,40 +1946,28 @@ Ops.set(c, "device", info.device) t = info.type Ops.set(c, "type", toSymbol(@conv_ctype, t)) - t = info.usedByType - if t != ::Storage::UB_NONE - Ops.set(c, "used_by_type", toSymbol(@conv_usedby, t)) - Ops.set( - c, - "used_by_device", - info.usedByDevice - ) - Ops.set( - c, - "used_by", - [ - { - "type" => Ops.get_symbol(c, "used_by_type", :UB_NONE), - "device" => Ops.get_string(c, "used_by_device", "") - } - ] - ) - end + + c.merge!(usedbyMap(info)) + Builtins.y2milestone("c:%1",c) b = info.readonly Ops.set(c, "readonly", true) if b - tmp = info.udevPath - Ops.set(c, "udev_path", tmp) if !Builtins.isempty(tmp) - tmp = info.udevId - if !Builtins.isempty(tmp) - Ops.set(c, "udev_id", Builtins.splitstring(tmp, " ")) + + c["udev_path"] = info.udevPath if !info.udevPath.empty? + + if !info.udevId.empty? + tmp = [] + info.udevId.each { |udev_id| tmp.push(udev_id) } + c["udev_id"] = tmp end + ret = Builtins.add(ret, c) end Builtins.y2milestone("getContainers ret:%1", ret) deep_copy(ret) end + def IsDiskType(t) Builtins.contains([:CT_DISK, :CT_DMRAID, :CT_DMMULTIPATH, :CT_MDPART], t) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/src/modules/StorageProposal.rb new/yast2-storage-3.1.3/src/modules/StorageProposal.rb --- old/yast2-storage-3.1.2/src/modules/StorageProposal.rb 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/src/modules/StorageProposal.rb 2013-12-04 10:21:37.000000000 +0100 @@ -59,14 +59,13 @@ @proposal_home = false @proposal_lvm = false @proposal_encrypt = false - @proposal_btrfs = false + @proposal_snapshots = false @proposal_suspend = false @proposal_password = "" @proposal_create_vg = false @cfg_xml = {} - @swapable = {} @ishome = {} end @@ -112,17 +111,17 @@ nil end - def GetProposalBtrfs - @proposal_btrfs - end - def SetProposalBtrfs(val) - @proposal_btrfs = val - Builtins.y2milestone("SetProposalBtrfs val:%1", val) + def GetProposalSnapshots() + @proposal_snapshots + end - nil + def SetProposalSnapshots(val) + @proposal_snapshots = val + Builtins.y2milestone("SetProposalSnapshots val:%1", val) end + def GetProposalSuspend @proposal_suspend end @@ -145,6 +144,7 @@ nil end + def SetProposalDefault(home_only) SetProposalHome(Ops.get_boolean(@cfg_xml, "home", false)) if !home_only @@ -153,14 +153,14 @@ SetProposalPassword("") SetProposalSuspend(Ops.get_boolean(@cfg_xml, "suspend", false)) end - SetProposalBtrfs(Ops.get_boolean(@cfg_xml, "btrfs", false)) + SetProposalSnapshots(Ops.get_boolean(@cfg_xml, "prop_snapshots", false)) Builtins.y2milestone( - "SetProposalDefault home:%1 lvm:%2 encypt:%3 home_only:%4 btrfs:%5 suspend:%6", + "SetProposalDefault home:%1 lvm:%2 encypt:%3 home_only:%4 snapshots:%5 suspend:%6", @proposal_home, @proposal_lvm, @proposal_encrypt, home_only, - @proposal_btrfs, + @proposal_snapshots, @proposal_suspend ) @@ -257,6 +257,9 @@ btmp = ProductFeatures.GetBooleanFeature("partitioning", "proposal_lvm") Ops.set(@cfg_xml, "prop_lvm", btmp ? true : false) + btmp = ProductFeatures.GetBooleanFeature("partitioning", "proposal_snapshots") + Ops.set(@cfg_xml, "prop_snapshots", btmp ? true : false) + itmp = ProductFeatures.GetIntegerFeature( "partitioning", "btrfs_increase_percentage" @@ -269,20 +272,22 @@ ) Ops.set(@cfg_xml, "btrfs_increase_percentage", 100) end + btmp = ProductFeatures.GetBooleanFeature( "partitioning", "swap_for_suspend" ) Ops.set(@cfg_xml, "suspend", btmp ? true : false) + SetProposalDefault(false) Builtins.y2milestone("GetControlCfg cfg_xml:%1", @cfg_xml) end ret = deep_copy(@cfg_xml) Builtins.y2milestone( - "GetControlCfg GetProposalBtrfs:%1", - GetProposalBtrfs() + "GetControlCfg GetProposalSnapshots:%1", + GetProposalSnapshots() ) - if GetProposalBtrfs() + if GetProposalSnapshots() Builtins.y2milestone("GetControlCfg before:%1", ret) keys = ["home_limit", "root_max", "root_base", "home_max", "vm_want"] Builtins.foreach(keys) do |k| @@ -308,6 +313,7 @@ deep_copy(ret) end + def GetProposalVM ret = "" ret = "system" if @proposal_lvm @@ -315,10 +321,14 @@ ret end - def PropDefaultFs - ret = Partitions.DefaultFs - ret = :btrfs if GetProposalBtrfs() - ret + + def PropDefaultFs() + Partitions.DefaultFs() + end + + + def PropDefaultHomeFs() + Partitions.DefaultHomeFs() end @@ -605,9 +615,8 @@ def need_boot(disk) Builtins.y2milestone( - "need_boot NeedBoot:%1 GetProposalBtrfs:%2 type:%3", + "need_boot NeedBoot:%1 type:%2", Partitions.NeedBoot, - GetProposalBtrfs(), disk.fetch("type",:CT_UNKNOWN) ) ret = Partitions.NeedBoot || @@ -3714,7 +3723,7 @@ if !Ops.get_boolean(p, "delete", false) && Ops.get_string(p, "device", "") == Ops.get_string(pl, [0, "device"], "") - p = Storage.SetVolOptions(p, "/home", PropDefaultFs(), "", "", "") + p = Storage.SetVolOptions(p, "/home", PropDefaultHomeFs(), "", "", "") end deep_copy(p) end @@ -3872,7 +3881,7 @@ home = { "mount" => "/home", "increasable" => true, - "fsys" => PropDefaultFs(), + "fsys" => PropDefaultHomeFs(), "size" => 512 * 1024 * 1024, "pct" => Ops.subtract( 100, @@ -4639,7 +4648,7 @@ home = { "mount" => "/home", "increasable" => true, - "fsys" => PropDefaultFs(), + "fsys" => PropDefaultHomeFs(), "size" => 512 * 1024 * 1024, "pct" => Ops.subtract( 100, @@ -5414,7 +5423,7 @@ "device" => Ops.add(Ops.get_string(ret, "device", ""), "/home"), "size_k" => pe_to_sizek(home_pe, pe) } - p = Storage.SetVolOptions(p, "/home", PropDefaultFs(), "", "", "") + p = Storage.SetVolOptions(p, "/home", PropDefaultHomeFs(), "", "", "") Builtins.y2milestone("modify_vm created %1", p) Ops.set( ret, @@ -5427,7 +5436,7 @@ "partitions", Builtins.maplist(Ops.get_list(ret, "partitions", [])) do |p| if Ops.get_string(p, "name", "") == "home" - p = Storage.SetVolOptions(p, "/home", PropDefaultFs(), "", "", "") + p = Storage.SetVolOptions(p, "/home", PropDefaultHomeFs(), "", "", "") Builtins.y2milestone("modify_vm reuse %1", p) end deep_copy(p) @@ -5964,8 +5973,9 @@ def AddCommonWidgets - vb = VBox() space = SaveHeight() ? 0.0 : 0.5 + + vb = VBox() vb = Builtins.add( vb, Left( @@ -6019,11 +6029,11 @@ HBox( HSpacing(3), CheckBox( - Id(:btrfs), + Id(:snapshots), Opt(:notify), # Label text - _("Use &Btrfs as Default File System"), - GetProposalBtrfs() + _("Enable Snapshots"), + GetProposalSnapshots() ) ) ) @@ -6057,9 +6067,9 @@ ) Builtins.y2milestone( - "AddCommonWidgets Home:%1 Btrfs:%2", + "AddCommonWidgets Home:%1 Snapshots:%2", GetProposalHome(), - GetProposalBtrfs() + GetProposalSnapshots() ) deep_copy(frame) end @@ -6142,6 +6152,12 @@ end end + + def IsCommonWidget(id) + return [ :lvm, :home, :encrypt, :snapshots, :suspend ].include?(id) + end + + def HandleCommonWidgets(id) ret = false val = Convert.to_boolean(UI.QueryWidget(Id(id), :Value)) @@ -6162,12 +6178,12 @@ SetProposalEncrypt(false) end ret = true - when :btrfs - SetProposalBtrfs(val) - ret = true when :home SetProposalHome(val) ret = true + when :snapshots + SetProposalSnapshots(val) + ret = true when :suspend SetProposalSuspend(val) ret = true @@ -6175,6 +6191,7 @@ ret end + publish :function => :SetCreateVg, :type => "void (boolean)" publish :function => :GetProposalHome, :type => "boolean ()" publish :function => :SetProposalHome, :type => "void (boolean)" @@ -6182,8 +6199,8 @@ publish :function => :SetProposalLvm, :type => "void (boolean)" publish :function => :GetProposalEncrypt, :type => "boolean ()" publish :function => :SetProposalEncrypt, :type => "void (boolean)" - publish :function => :GetProposalBtrfs, :type => "boolean ()" - publish :function => :SetProposalBtrfs, :type => "void (boolean)" + publish :function => :GetProposalSnapshots, :type => "boolean ()" + publish :function => :SetProposalSnapshots, :type => "void (boolean)" publish :function => :GetProposalSuspend, :type => "boolean ()" publish :function => :SetProposalSuspend, :type => "void (boolean)" publish :function => :GetProposalPassword, :type => "string ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/empty-efi1.out new/yast2-storage-3.1.3/testsuite/tests/empty-efi1.out --- old/yast2-storage-3.1.2/testsuite/tests/empty-efi1.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/empty-efi1.out 2013-12-04 10:21:37.000000000 +0100 @@ -1,4 +1,15 @@ Dump Proposal: Dump Create boot volume /dev/sda1 (156.88 MiB) with vfat Dump Create swap volume /dev/sda2 (517.72 MiB) -Dump Create root volume /dev/sda3 (297.43 GiB) with ext4 +Dump Create root volume /dev/sda3 (297.43 GiB) 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/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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/empty-efi2.out new/yast2-storage-3.1.3/testsuite/tests/empty-efi2.out --- old/yast2-storage-3.1.2/testsuite/tests/empty-efi2.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/empty-efi2.out 2013-12-04 10:21:38.000000000 +0100 @@ -1,5 +1,16 @@ Dump Proposal: Dump Create boot volume /dev/sda1 (156.88 MiB) with vfat Dump Create swap volume /dev/sda2 (2.01 GiB) -Dump Create root volume /dev/sda3 (20.00 GiB) with ext4 -Dump Create volume /dev/sda4 (275.93 GiB) for /home with ext4 +Dump Create root volume /dev/sda3 (20.00 GiB) with btrfs +Dump Create volume /dev/sda4 (275.93 GiB) for /home with xfs +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/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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/empty1.out new/yast2-storage-3.1.3/testsuite/tests/empty1.out --- old/yast2-storage-3.1.2/testsuite/tests/empty1.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/empty1.out 2013-12-04 10:21:38.000000000 +0100 @@ -1,3 +1,14 @@ Dump Proposal: Dump Create swap volume /dev/sda1 (517.72 MiB) -Dump Create root volume /dev/sda2 (297.58 GiB) with ext4 +Dump Create root volume /dev/sda2 (297.58 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/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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/empty2.out new/yast2-storage-3.1.3/testsuite/tests/empty2.out --- old/yast2-storage-3.1.2/testsuite/tests/empty2.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/empty2.out 2013-12-04 10:21:38.000000000 +0100 @@ -1,4 +1,15 @@ Dump Proposal: Dump Create swap volume /dev/sda1 (2.01 GiB) -Dump Create root volume /dev/sda2 (20.00 GiB) with ext4 -Dump Create volume /dev/sda3 (276.08 GiB) for /home with ext4 +Dump Create root volume /dev/sda2 (20.00 GiB) with btrfs +Dump Create volume /dev/sda3 (276.08 GiB) for /home with xfs +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/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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/empty3.out new/yast2-storage-3.1.3/testsuite/tests/empty3.out --- old/yast2-storage-3.1.2/testsuite/tests/empty3.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/empty3.out 2013-12-04 10:21:38.000000000 +0100 @@ -2,5 +2,16 @@ Dump Create boot volume /dev/sda1 (400.06 MiB) with ext4 Dump Create volume /dev/sda2 (29.96 GiB) Dump Create volume group system (29.95 GiB) from /dev/sda2 [destructive] -Dump Create logical volume /dev/system/root (10.00 GiB) for / with ext4 +Dump Create root volume /dev/system/root (10.00 GiB) with btrfs Dump Create swap logical volume /dev/system/swap (512.00 MiB) +Dump Create subvolume boot/grub2/i386-pc on device /dev/system/root +Dump Create subvolume home on device /dev/system/root +Dump Create subvolume opt on device /dev/system/root +Dump Create subvolume srv on device /dev/system/root +Dump Create subvolume tmp on device /dev/system/root +Dump Create subvolume usr/local on device /dev/system/root +Dump Create subvolume var/crash on device /dev/system/root +Dump Create subvolume var/log on device /dev/system/root +Dump Create subvolume var/opt on device /dev/system/root +Dump Create subvolume var/spool on device /dev/system/root +Dump Create subvolume var/tmp on device /dev/system/root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/empty4.out new/yast2-storage-3.1.3/testsuite/tests/empty4.out --- old/yast2-storage-3.1.2/testsuite/tests/empty4.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/empty4.out 2013-12-04 10:21:38.000000000 +0100 @@ -2,6 +2,17 @@ Dump Create boot volume /dev/sda1 (400.06 MiB) with ext4 Dump Create volume /dev/sda2 (29.96 GiB) Dump Create volume group system (29.95 GiB) from /dev/sda2 [destructive] -Dump Create logical volume /dev/system/home (19.45 GiB) for /home with ext4 -Dump Create logical volume /dev/system/root (10.00 GiB) for / with ext4 +Dump Create logical volume /dev/system/home (19.45 GiB) for /home with xfs +Dump Create root volume /dev/system/root (10.00 GiB) with btrfs Dump Create swap logical volume /dev/system/swap (512.00 MiB) +Dump Create subvolume boot/grub2/i386-pc on device /dev/system/root +Dump Create subvolume home on device /dev/system/root +Dump Create subvolume opt on device /dev/system/root +Dump Create subvolume srv on device /dev/system/root +Dump Create subvolume tmp on device /dev/system/root +Dump Create subvolume usr/local on device /dev/system/root +Dump Create subvolume var/crash on device /dev/system/root +Dump Create subvolume var/log on device /dev/system/root +Dump Create subvolume var/opt on device /dev/system/root +Dump Create subvolume var/spool on device /dev/system/root +Dump Create subvolume var/tmp on device /dev/system/root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/empty5.out new/yast2-storage-3.1.3/testsuite/tests/empty5.out --- old/yast2-storage-3.1.2/testsuite/tests/empty5.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/empty5.out 2013-12-04 10:21:38.000000000 +0100 @@ -2,5 +2,16 @@ Dump Create boot volume /dev/sda1 (400.06 MiB) with ext4 Dump Create volume /dev/sda2 (297.70 GiB) Dump Create volume group system (297.69 GiB) from /dev/sda2 [destructive] -Dump Create logical volume /dev/system/root (10.00 GiB) for / with ext4 +Dump Create root volume /dev/system/root (10.00 GiB) with btrfs Dump Create swap logical volume /dev/system/swap (768.00 MiB) +Dump Create subvolume boot/grub2/i386-pc on device /dev/system/root +Dump Create subvolume home on device /dev/system/root +Dump Create subvolume opt on device /dev/system/root +Dump Create subvolume srv on device /dev/system/root +Dump Create subvolume tmp on device /dev/system/root +Dump Create subvolume usr/local on device /dev/system/root +Dump Create subvolume var/crash on device /dev/system/root +Dump Create subvolume var/log on device /dev/system/root +Dump Create subvolume var/opt on device /dev/system/root +Dump Create subvolume var/spool on device /dev/system/root +Dump Create subvolume var/tmp on device /dev/system/root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/empty6.out new/yast2-storage-3.1.3/testsuite/tests/empty6.out --- old/yast2-storage-3.1.2/testsuite/tests/empty6.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/empty6.out 2013-12-04 10:21:38.000000000 +0100 @@ -2,6 +2,17 @@ Dump Create boot volume /dev/sda1 (400.06 MiB) with ext4 Dump Create volume /dev/sda2 (297.70 GiB) Dump Create volume group system (297.69 GiB) from /dev/sda2 [destructive] -Dump Create logical volume /dev/system/home (25.00 GiB) for /home with ext4 -Dump Create logical volume /dev/system/root (10.00 GiB) for / with ext4 +Dump Create logical volume /dev/system/home (25.00 GiB) for /home with xfs +Dump Create root volume /dev/system/root (10.00 GiB) with btrfs Dump Create swap logical volume /dev/system/swap (768.00 MiB) +Dump Create subvolume boot/grub2/i386-pc on device /dev/system/root +Dump Create subvolume home on device /dev/system/root +Dump Create subvolume opt on device /dev/system/root +Dump Create subvolume srv on device /dev/system/root +Dump Create subvolume tmp on device /dev/system/root +Dump Create subvolume usr/local on device /dev/system/root +Dump Create subvolume var/crash on device /dev/system/root +Dump Create subvolume var/log on device /dev/system/root +Dump Create subvolume var/opt on device /dev/system/root +Dump Create subvolume var/spool on device /dev/system/root +Dump Create subvolume var/tmp on device /dev/system/root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/empty7.out new/yast2-storage-3.1.3/testsuite/tests/empty7.out --- old/yast2-storage-3.1.2/testsuite/tests/empty7.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/empty7.out 2013-12-04 10:21:38.000000000 +0100 @@ -0,0 +1,15 @@ +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 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/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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/empty7.rb new/yast2-storage-3.1.3/testsuite/tests/empty7.rb --- old/yast2-storage-3.1.2/testsuite/tests/empty7.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/empty7.rb 2013-12-04 10:21:38.000000000 +0100 @@ -0,0 +1,28 @@ +# 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", "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.2/testsuite/tests/half-empty1.out new/yast2-storage-3.1.3/testsuite/tests/half-empty1.out --- old/yast2-storage-3.1.2/testsuite/tests/half-empty1.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/half-empty1.out 2013-12-04 10:21:38.000000000 +0100 @@ -1,5 +1,16 @@ Dump Proposal: Dump Create extended partition /dev/sda3 (147.09 GiB) Dump Create swap volume /dev/sda5 (2.01 GiB) -Dump Create root volume /dev/sda6 (20.00 GiB) with ext4 -Dump Create volume /dev/sda7 (125.08 GiB) for /home with ext4 +Dump Create root volume /dev/sda6 (20.00 GiB) with btrfs +Dump Create volume /dev/sda7 (125.08 GiB) for /home with xfs +Dump Create subvolume boot/grub2/i386-pc on device /dev/sda6 +Dump Create subvolume home on device /dev/sda6 +Dump Create subvolume opt on device /dev/sda6 +Dump Create subvolume srv on device /dev/sda6 +Dump Create subvolume tmp on device /dev/sda6 +Dump Create subvolume usr/local on device /dev/sda6 +Dump Create subvolume var/crash on device /dev/sda6 +Dump Create subvolume var/log on device /dev/sda6 +Dump Create subvolume var/opt on device /dev/sda6 +Dump Create subvolume var/spool on device /dev/sda6 +Dump Create subvolume var/tmp on device /dev/sda6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/helper1a.rb new/yast2-storage-3.1.3/testsuite/tests/helper1a.rb --- old/yast2-storage-3.1.2/testsuite/tests/helper1a.rb 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/helper1a.rb 2013-12-04 10:21:38.000000000 +0100 @@ -16,7 +16,7 @@ "meminfo" => { "memtotal" => 256 * 1024 } }, "sysconfig" => { - "storage" => { "DEFAULT_FS" => "ext4" }, + "storage" => { "DEFAULT_FS" => "btrfs" }, "bootloader" => { "LOADER_TYPE" => "grub" }, "language" => { "RC_LANG" => "en_US.UTF-8", "RC_LC_MESSAGES" => "" } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/reuse-home1.out new/yast2-storage-3.1.3/testsuite/tests/reuse-home1.out --- old/yast2-storage-3.1.2/testsuite/tests/reuse-home1.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/reuse-home1.out 2013-12-04 10:21:38.000000000 +0100 @@ -1,4 +1,15 @@ Dump Proposal: -Dump Format partition /dev/sda2 (15.01 GiB) for / with ext4 [destructive] +Dump Format partition /dev/sda2 (15.01 GiB) with btrfs [destructive] +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/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 Use /dev/sda1 as swap Dump Set mount point of /dev/sda3 to /home diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/windows-only-efi1.out new/yast2-storage-3.1.3/testsuite/tests/windows-only-efi1.out --- old/yast2-storage-3.1.2/testsuite/tests/windows-only-efi1.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/windows-only-efi1.out 2013-12-04 10:21:38.000000000 +0100 @@ -1,5 +1,16 @@ Dump Proposal: Dump Shrink Windows partition /dev/sda2 to 7.78 GiB [destructive] Dump Create swap volume /dev/sda3 (517.72 MiB) -Dump Create root volume /dev/sda4 (7.62 GiB) with ext4 +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 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 +Dump Create subvolume usr/local on device /dev/sda4 +Dump Create subvolume var/crash on device /dev/sda4 +Dump Create subvolume var/log on device /dev/sda4 +Dump Create subvolume var/opt on device /dev/sda4 +Dump Create subvolume var/spool on device /dev/sda4 +Dump Create subvolume var/tmp on device /dev/sda4 Dump Set mount point of /dev/sda1 to /boot/efi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/windows-only1.out new/yast2-storage-3.1.3/testsuite/tests/windows-only1.out --- old/yast2-storage-3.1.2/testsuite/tests/windows-only1.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/windows-only1.out 2013-12-04 10:21:38.000000000 +0100 @@ -2,5 +2,16 @@ Dump Shrink Windows partition /dev/sda1 to 33.21 GiB [destructive] Dump Create extended partition /dev/sda2 (41.32 GiB) Dump Create swap volume /dev/sda5 (517.72 MiB) -Dump Create root volume /dev/sda6 (16.50 GiB) with ext4 -Dump Create volume /dev/sda7 (24.31 GiB) for /home with ext4 +Dump Create root volume /dev/sda6 (16.50 GiB) with btrfs +Dump Create volume /dev/sda7 (24.31 GiB) for /home with xfs +Dump Create subvolume boot/grub2/i386-pc on device /dev/sda6 +Dump Create subvolume home on device /dev/sda6 +Dump Create subvolume opt on device /dev/sda6 +Dump Create subvolume srv on device /dev/sda6 +Dump Create subvolume tmp on device /dev/sda6 +Dump Create subvolume usr/local on device /dev/sda6 +Dump Create subvolume var/crash on device /dev/sda6 +Dump Create subvolume var/log on device /dev/sda6 +Dump Create subvolume var/opt on device /dev/sda6 +Dump Create subvolume var/spool on device /dev/sda6 +Dump Create subvolume var/tmp on device /dev/sda6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/testsuite/tests/windows1.out new/yast2-storage-3.1.3/testsuite/tests/windows1.out --- old/yast2-storage-3.1.2/testsuite/tests/windows1.out 2013-11-26 17:29:50.000000000 +0100 +++ new/yast2-storage-3.1.3/testsuite/tests/windows1.out 2013-12-04 10:21:38.000000000 +0100 @@ -1,5 +1,16 @@ Dump Proposal: Dump Create extended partition /dev/sda2 (34.52 GiB) Dump Create swap volume /dev/sda5 (517.72 MiB) -Dump Create root volume /dev/sda6 (15.01 GiB) with ext4 -Dump Create volume /dev/sda7 (19.01 GiB) for /home with ext4 +Dump Create root volume /dev/sda6 (15.01 GiB) with btrfs +Dump Create volume /dev/sda7 (19.01 GiB) for /home with xfs +Dump Create subvolume boot/grub2/i386-pc on device /dev/sda6 +Dump Create subvolume home on device /dev/sda6 +Dump Create subvolume opt on device /dev/sda6 +Dump Create subvolume srv on device /dev/sda6 +Dump Create subvolume tmp on device /dev/sda6 +Dump Create subvolume usr/local on device /dev/sda6 +Dump Create subvolume var/crash on device /dev/sda6 +Dump Create subvolume var/log on device /dev/sda6 +Dump Create subvolume var/opt on device /dev/sda6 +Dump Create subvolume var/spool on device /dev/sda6 +Dump Create subvolume var/tmp on device /dev/sda6 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
