Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-06-30 21:42:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2014-06-26 08:00:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-06-30 21:42:45.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Jun 27 13:22:01 CEST 2014 - schubi@suse.de + +- -- Set default filesystem for native FS only. + -- Do not format BIOS Grup partitions. + Side effects of bug bnc#880569 +- 3.1.40 + + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.39.tar.bz2 New: ---- autoyast2-3.1.40.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.wtZd5G/_old 2014-06-30 21:42:46.000000000 +0200 +++ /var/tmp/diff_new_pack.wtZd5G/_new 2014-06-30 21:42:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.39 +Version: 3.1.40 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.39.tar.bz2 -> autoyast2-3.1.40.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.39/package/autoyast2.changes new/autoyast2-3.1.40/package/autoyast2.changes --- old/autoyast2-3.1.39/package/autoyast2.changes 2014-06-25 12:25:26.000000000 +0200 +++ new/autoyast2-3.1.40/package/autoyast2.changes 2014-06-27 15:15:21.000000000 +0200 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Jun 27 13:22:01 CEST 2014 - schubi@suse.de + +- -- Set default filesystem for native FS only. + -- Do not format BIOS Grup partitions. + Side effects of bug bnc#880569 +- 3.1.40 + + +------------------------------------------------------------------- Wed Jun 25 09:49:05 CEST 2014 - schubi@suse.de - Setting default filesystem if it has not been set in autoinst.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.39/package/autoyast2.spec new/autoyast2-3.1.40/package/autoyast2.spec --- old/autoyast2-3.1.39/package/autoyast2.spec 2014-06-25 12:25:26.000000000 +0200 +++ new/autoyast2-3.1.40/package/autoyast2.spec 2014-06-27 15:15:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.39 +Version: 3.1.40 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.39/src/include/autoinstall/autopart.rb new/autoyast2-3.1.40/src/include/autoinstall/autopart.rb --- old/autoyast2-3.1.39/src/include/autoinstall/autopart.rb 2014-06-25 12:25:26.000000000 +0200 +++ new/autoyast2-3.1.40/src/include/autoinstall/autopart.rb 2014-06-27 15:15:21.000000000 +0200 @@ -122,6 +122,14 @@ deep_copy(ret) end + def propose_default_fs?(partition) + valid_fsids = [Partitions.fsid_gpt_boot, Partitions.fsid_native] + + (!partition.has_key?("filesystem") || + partition["filesystem"] == :none) && + valid_fsids.include?(partition["filesystem_id"]) + end + # Read partition data from XML control file # @return [Hash] flexible propsal map def preprocess_partition_config(xmlflex) @@ -212,7 +220,7 @@ #Setting default filesystem if it has not been a part of autoinst.xml #Bug 880569 - if !partition.has_key?("filesystem") || partition["filesystem"] == :none + if propose_default_fs?(partition) if partition["mount"] == Partitions.BootMount partition["filesystem"] = Partitions.DefaultBootFs else @@ -220,6 +228,9 @@ end end + # Do not format BIOS Grup partitions + partition["format"] = false if partition["filesystem_id"] == Partitions.fsid_bios_grub + if Ops.get_integer(partition, "size", 0) == -1 Ops.set(partition, "size", 0) end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org