Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-06-02 07:00:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-13 20:46:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-06-02 07:00:06.000000000 +0200 @@ -1,0 +2,28 @@ +Wed May 26 18:54:23 CEST 2014 - dvaleev@suse.com + +- Fix broken disklabel fetch (bnc#879147) +- 3.1.29 + +------------------------------------------------------------------- +Wed May 21 14:45:15 CEST 2014 - schubi@suse.de + +- Pass disklabel to FsidBoot which is supported by yast2-storage + >= 3.1.27 +- 3.1.28 + +------------------------------------------------------------------- +Mon May 19 15:32:33 CEST 2014 - schubi@suse.de + +- Do not generate subvolumes entries for snapshots in autoinst.xml + (bnc#878414) +- 3.1.27 + +------------------------------------------------------------------- +Mon May 19 12:47:52 CEST 2014 - schubi@suse.de + +- Flagging yast module for export while generating the autoyast + configuration file in the installation mode. + (bnc#877985) +- 3.1.26 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.25.tar.bz2 New: ---- autoyast2-3.1.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.lcauZo/_old 2014-06-02 07:00:07.000000000 +0200 +++ /var/tmp/diff_new_pack.lcauZo/_new 2014-06-02 07:00:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.25 +Version: 3.1.29 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,7 +45,7 @@ Requires: yast2-core Requires: yast2-country Requires: yast2-schema -Requires: yast2-storage >= 3.0.5 +Requires: yast2-storage >= 3.1.27 Requires: yast2-transfer >= 2.21.0 Requires: yast2-xml ++++++ autoyast2-3.1.25.tar.bz2 -> autoyast2-3.1.29.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.25/package/autoyast2.changes new/autoyast2-3.1.29/package/autoyast2.changes --- old/autoyast2-3.1.25/package/autoyast2.changes 2014-05-12 15:30:46.000000000 +0200 +++ new/autoyast2-3.1.29/package/autoyast2.changes 2014-05-27 15:10:46.000000000 +0200 @@ -1,4 +1,32 @@ ------------------------------------------------------------------- +Wed May 26 18:54:23 CEST 2014 - dvaleev@suse.com + +- Fix broken disklabel fetch (bnc#879147) +- 3.1.29 + +------------------------------------------------------------------- +Wed May 21 14:45:15 CEST 2014 - schubi@suse.de + +- Pass disklabel to FsidBoot which is supported by yast2-storage + >= 3.1.27 +- 3.1.28 + +------------------------------------------------------------------- +Mon May 19 15:32:33 CEST 2014 - schubi@suse.de + +- Do not generate subvolumes entries for snapshots in autoinst.xml + (bnc#878414) +- 3.1.27 + +------------------------------------------------------------------- +Mon May 19 12:47:52 CEST 2014 - schubi@suse.de + +- Flagging yast module for export while generating the autoyast + configuration file in the installation mode. + (bnc#877985) +- 3.1.26 + +------------------------------------------------------------------- Mon May 12 15:12:12 CEST 2014 - schubi@suse.de - Reading software and partition selections before generating diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.25/package/autoyast2.spec new/autoyast2-3.1.29/package/autoyast2.spec --- old/autoyast2-3.1.25/package/autoyast2.spec 2014-05-12 15:30:46.000000000 +0200 +++ new/autoyast2-3.1.29/package/autoyast2.spec 2014-05-27 15:10:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.25 +Version: 3.1.29 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,7 +45,7 @@ Requires: yast2-core Requires: yast2-country Requires: yast2-schema -Requires: yast2-storage >= 3.0.5 +Requires: yast2-storage >= 3.1.27 Requires: yast2-transfer >= 2.21.0 Requires: yast2-xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.25/src/include/autoinstall/autopart.rb new/autoyast2-3.1.29/src/include/autoinstall/autopart.rb --- old/autoyast2-3.1.25/src/include/autoinstall/autopart.rb 2014-05-12 15:30:46.000000000 +0200 +++ new/autoyast2-3.1.29/src/include/autoinstall/autopart.rb 2014-05-27 15:10:46.000000000 +0200 @@ -129,6 +129,7 @@ Builtins.y2debug("xml input: %1", xmlflex) tm = Storage.GetTargetMap partitioning = Builtins.maplist(xmlflex) do |d| + dlabel = d.fetch("disklabel", "msdos") Builtins.foreach(["keep_partition_id", "keep_partition_num"]) do |key| num = [] nlist2 = Builtins.splitstring(Ops.get_string(d, key, ""), ",") @@ -206,7 +207,7 @@ end if Ops.get_integer(partition, "filesystem_id", 0) == 0 - Ops.set(partition, "filesystem_id", Partitions.FsidBoot) + Ops.set(partition, "filesystem_id", Partitions.FsidBoot(dlabel)) end #partition["max_cyl"] = Partitions::BootCyl(); @@ -246,6 +247,7 @@ def try_add_boot(conf, disk) conf = deep_copy(conf) disk = deep_copy(disk) + dlabel = disk.fetch("label", "") root = Ops.greater_than( Builtins.size(Builtins.filter(Ops.get_list(conf, "partitions", [])) do |e| Ops.get_string(e, "mount", "") == "/" @@ -268,9 +270,9 @@ end Ops.set(pb, "size", Partitions.MinimalNeededBootsize) Ops.set(pb, "filesystem", Partitions.DefaultBootFs) - Ops.set(pb, "fsid", Partitions.FsidBoot) # FIXME: might be useless - Ops.set(pb, "filesystem_id", Partitions.FsidBoot) - Ops.set(pb, "id", Partitions.FsidBoot) # FIXME: might be useless + Ops.set(pb, "fsid", Partitions.FsidBoot(dlabel)) # FIXME: might be useless + Ops.set(pb, "filesystem_id", Partitions.FsidBoot(dlabel)) + Ops.set(pb, "id", Partitions.FsidBoot(dlabel)) # FIXME: might be useless Ops.set(pb, "auto_added", true) Ops.set(pb, "type", :primary) # FIXME: might be useless Ops.set(pb, "partition_type", "primary") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.25/src/modules/AutoinstClone.rb new/autoyast2-3.1.29/src/modules/AutoinstClone.rb --- old/autoyast2-3.1.25/src/modules/AutoinstClone.rb 2014-05-12 15:30:46.000000000 +0200 +++ new/autoyast2-3.1.29/src/modules/AutoinstClone.rb 2014-05-27 15:10:46.000000000 +0200 @@ -105,8 +105,9 @@ if !Stage.initial || ["software_auto", "storage_auto"].include?(auto) Call.Function(auto, ["Read"]) - Call.Function(auto, ["SetModified"]) end + # Flagging YAST module for export + Call.Function(auto, ["SetModified"]) true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.25/src/modules/AutoinstPartition.rb new/autoyast2-3.1.29/src/modules/AutoinstPartition.rb --- old/autoyast2-3.1.25/src/modules/AutoinstPartition.rb 2014-05-12 15:30:46.000000000 +0200 +++ new/autoyast2-3.1.29/src/modules/AutoinstPartition.rb 2014-05-27 15:10:46.000000000 +0200 @@ -270,7 +270,8 @@ newPart = Builtins.remove(newPart, "mkfs_options") end if !Builtins.isempty(Ops.get_list(part, "subvolumes", [])) - Ops.set(newPart, "subvolumes", Ops.get_list(part, "subvolumes", [])) + #Filtering out all snapper subvolumes + newPart["subvolumes"] = part["subvolumes"].reject { |s| s.start_with?(".snapshots") } else newPart = Builtins.remove(newPart, "subvolumes") end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.25/src/modules/AutoinstStorage.rb new/autoyast2-3.1.29/src/modules/AutoinstStorage.rb --- old/autoyast2-3.1.25/src/modules/AutoinstStorage.rb 2014-05-12 15:30:46.000000000 +0200 +++ new/autoyast2-3.1.29/src/modules/AutoinstStorage.rb 2014-05-27 15:10:46.000000000 +0200 @@ -1093,11 +1093,12 @@ end Builtins.foreach(@AutoTargetMap) do |device, data| + dlabel = data.fetch("label", "") if Ops.greater_than( Builtins.size(Builtins.filter(data.fetch("partitions",[])) do |e| e.fetch("mount","") == Partitions.BootMount || - e.fetch("partition_id",0) == Partitions.FsidBoot && - Partitions.FsidBoot != 131 + e.fetch("partition_id",0) == Partitions.FsidBoot(dlabel) && + Partitions.FsidBoot(dlabel) != 131 end), 0 ) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org