Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/autoyast2 -> sle12 ## BNC# 884618 : "autoyast tmpfs bug - SLES12 Beta 9" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/autoyast2/autoyast2.changes 2014-07-03 17:19:04.000000000 +0200 +++ /mounts/work_src_done/SLE12/autoyast2/autoyast2.changes 2014-07-04 15:54:09.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 4 14:15:09 CEST 2014 - schubi@suse.de + +- Enable tmpfs in auotyast (bnc#884618) +- 3.1.42 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - autoyast2 - yast2-product-creator - yast2-schema ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/autoyast2 (Old) and /mounts/work_src_done/SLE12/autoyast2 (BS:build ID:40750 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2", Maintainer is "yast-commit@opensuse.org" Old: ---- autoyast2-3.1.41.tar.bz2 New: ---- autoyast2-3.1.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.aDBBMy/_old 2014-07-04 16:01:57.000000000 +0200 +++ /var/tmp/diff_new_pack.aDBBMy/_new 2014-07-04 16:01:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.41 +Version: 3.1.42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.41.tar.bz2 -> autoyast2-3.1.42.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.41/package/autoyast2.changes new/autoyast2-3.1.42/package/autoyast2.changes --- old/autoyast2-3.1.41/package/autoyast2.changes 2014-07-02 14:35:35.000000000 +0200 +++ new/autoyast2-3.1.42/package/autoyast2.changes 2014-07-04 15:50:43.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 4 14:15:09 CEST 2014 - schubi@suse.de + +- Enable tmpfs in auotyast (bnc#884618) +- 3.1.42 + +------------------------------------------------------------------- Wed Jul 2 13:50:18 CEST 2014 - schubi@suse.de - Activate imported S390 disk while the update process diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.41/package/autoyast2.spec new/autoyast2-3.1.42/package/autoyast2.spec --- old/autoyast2-3.1.41/package/autoyast2.spec 2014-07-02 14:35:35.000000000 +0200 +++ new/autoyast2-3.1.42/package/autoyast2.spec 2014-07-04 15:50:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.41 +Version: 3.1.42 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.41/src/modules/AutoinstDrive.rb new/autoyast2-3.1.42/src/modules/AutoinstDrive.rb --- old/autoyast2-3.1.41/src/modules/AutoinstDrive.rb 2014-07-02 14:35:36.000000000 +0200 +++ new/autoyast2-3.1.42/src/modules/AutoinstDrive.rb 2014-07-04 15:50:50.000000000 +0200 @@ -32,14 +32,13 @@ "type" => :CT_DISK, # type of drive, see diskTypes below "use" => :all, # `all, `linux, `free, or list of partition numbers to use "pesize" => "", - "enable_snapshots" => true, "disklabel" => "msdos" # type of partition table (msdos or gpt) } # size of physical extents (currently no GUI support for this setting) # Every drive created gets an id. @_id = 0 - # List of allowd disk/drive types - @diskTypes = [:CT_DISK, :CT_LVM, :CT_MD, :CT_NFS] + # List of allowed disk/drive types + @diskTypes = [:CT_DISK, :CT_LVM, :CT_MD, :CT_NFS, :CT_TMPFS] end # Determine if type is a valid drive type. @@ -358,11 +357,14 @@ Builtins.y2error("Couldn't construct PartitionT from '%1'", part) end end - newDrive = set( - newDrive, - "disklabel", - Ops.get_string(drive, "disklabel", "msdos") - ) + + if newDrive["type"] != :CT_TMPFS + newDrive["enable_snapshots"] = true # enable snapshot (default) + newDrive["disklabel"] = drive["disklabel"] if drive.has_key?("disklabel") + else + newDrive.delete("disklabel") + end + deep_copy(newDrive) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.41/src/modules/AutoinstPartPlan.rb new/autoyast2-3.1.42/src/modules/AutoinstPartPlan.rb --- old/autoyast2-3.1.41/src/modules/AutoinstPartPlan.rb 2014-07-02 14:35:36.000000000 +0200 +++ new/autoyast2-3.1.42/src/modules/AutoinstPartPlan.rb 2014-07-04 15:50:50.000000000 +0200 @@ -361,6 +361,7 @@ next if Ops.get_symbol(pe, "type", :x) == :extended new_pe = {} Ops.set(new_pe, "create", true) + new_pe["ignore_fstab"] = pe["ignore_fstab"] if pe.has_key?("ignore_fstab") skipwin = false if Builtins.haskey(pe, "enc_type") Ops.set( @@ -710,8 +711,18 @@ def Import(settings) settings = deep_copy(settings) Builtins.y2milestone("entering Import with %1", settings) + + # Filter out all tmpfs that have not been defined by the user. + # User created entries are defined in the fstab only. + tmpfs_devices = settings.select { |device| device["type"] == :CT_TMPFS } + tmpfs_devices.each do |device| + if device["partitions"] + device["partitions"].delete_if { |partition| partition["ignore_fstab"] } + end + end + @AutoPartPlan = [] - _IgnoreTypes = [:CT_TMPFS, :CT_BTRFS] + _IgnoreTypes = [:CT_BTRFS] Builtins.foreach(settings) do |drive| if !Builtins.contains( _IgnoreTypes, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.41/src/modules/AutoinstPartition.rb new/autoyast2-3.1.42/src/modules/AutoinstPartition.rb --- old/autoyast2-3.1.41/src/modules/AutoinstPartition.rb 2014-07-02 14:35:36.000000000 +0200 +++ new/autoyast2-3.1.42/src/modules/AutoinstPartition.rb 2014-07-04 15:50:50.000000000 +0200 @@ -286,19 +286,11 @@ newPart = Builtins.remove(newPart, "pool") end newPart = set(newPart, "loop_fs", Ops.get_boolean(part, "loop_fs", false)) - newPart = set( - newPart, - "partition_id", - Ops.get_integer(part, "partition_id", 131) - ) - if Builtins.haskey(part, "partition_nr") - newPart = set( - newPart, - "partition_nr", - Ops.get_integer(part, "partition_nr", 0) - ) + if part.has_key?("partition_id") + newPart["partition_id"] = part["partition_id"] else - newPart = Builtins.remove(newPart, "partition_nr") + #removing default entry + newPart.delete("partition_id") end newPart = set(newPart, "size", Ops.get_string(part, "size", "")) newPart = set(newPart, "lv_name", Ops.get_string(part, "lv_name", "")) @@ -354,6 +346,14 @@ newPart.delete("mountby") end + if part["filesystem"] == :tmpfs + # remove not needed entries for TMPFS + newPart.delete("partition_nr") + newPart.delete("resize") + newPart.delete("crypt_fs") + newPart.delete("loop_fs") + end + deep_copy(newPart) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.41/src/modules/AutoinstStorage.rb new/autoyast2-3.1.42/src/modules/AutoinstStorage.rb --- old/autoyast2-3.1.41/src/modules/AutoinstStorage.rb 2014-07-02 14:35:36.000000000 +0200 +++ new/autoyast2-3.1.42/src/modules/AutoinstStorage.rb 2014-07-04 15:50:51.000000000 +0200 @@ -1151,6 +1151,17 @@ end Storage.SetTargetMap(tm) if changed + changed = false + tmpfs_device = @AutoTargetMap["/dev/tmpfs"] + if tmpfs_device && tmpfs_device.has_key?("partitions") + # Adding TMPFS + tmpfs_device["partitions"].each do |partition| + Storage.AddTmpfsVolume(partition["mount"], partition["fstopt"] || "") + changed = true + end + end + log.info("Target map after setting tmpfs: #{Storage.GetTargetMap}") if changed + if Builtins.haskey(@AutoTargetMap, "/dev/nfs") Builtins.y2milestone("nfs:%1", Ops.get(@AutoTargetMap, "/dev/nfs", {})) Builtins.foreach( continue with "q"... Checked in at Fri Jul 4 16:02:03 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org