Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-07-10 08:16:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-30 21:50:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-07-10 08:17:04.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Jul 4 14:15:09 CEST 2014 - schubi(a)suse.de
+
+- Enable tmpfs in auotyast (bnc#884618)
+- 3.1.42
+
+-------------------------------------------------------------------
+Wed Jul 2 13:50:18 CEST 2014 - schubi(a)suse.de
+
+- Activate imported S390 disk while the update process
+ (bnc#883747)
+- 3.1.41
+
+-------------------------------------------------------------------
Old:
----
autoyast2-3.1.40.tar.bz2
New:
----
autoyast2-3.1.42.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.dVM9It/_old 2014-07-10 08:17:09.000000000 +0200
+++ /var/tmp/diff_new_pack.dVM9It/_new 2014-07-10 08:17:09.000000000 +0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 3.1.40
+Version: 3.1.42
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ autoyast2-3.1.40.tar.bz2 -> autoyast2-3.1.42.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.40/package/autoyast2.changes new/autoyast2-3.1.42/package/autoyast2.changes
--- old/autoyast2-3.1.40/package/autoyast2.changes 2014-06-27 15:15:21.000000000 +0200
+++ new/autoyast2-3.1.42/package/autoyast2.changes 2014-07-04 15:50:28.000000000 +0200
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Fri Jul 4 14:15:09 CEST 2014 - schubi(a)suse.de
+
+- Enable tmpfs in auotyast (bnc#884618)
+- 3.1.42
+
+-------------------------------------------------------------------
+Wed Jul 2 13:50:18 CEST 2014 - schubi(a)suse.de
+
+- Activate imported S390 disk while the update process
+ (bnc#883747)
+- 3.1.41
+
+-------------------------------------------------------------------
Fri Jun 27 13:22:01 CEST 2014 - schubi(a)suse.de
- -- Set default filesystem for native FS only.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.40/package/autoyast2.spec new/autoyast2-3.1.42/package/autoyast2.spec
--- old/autoyast2-3.1.40/package/autoyast2.spec 2014-06-27 15:15:21.000000000 +0200
+++ new/autoyast2-3.1.42/package/autoyast2.spec 2014-07-04 15:50:28.000000000 +0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 3.1.40
+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.40/src/clients/inst_autosetup_upgrade.rb new/autoyast2-3.1.42/src/clients/inst_autosetup_upgrade.rb
--- old/autoyast2-3.1.40/src/clients/inst_autosetup_upgrade.rb 2014-06-27 15:15:21.000000000 +0200
+++ new/autoyast2-3.1.42/src/clients/inst_autosetup_upgrade.rb 2014-07-04 15:50:28.000000000 +0200
@@ -183,17 +183,17 @@
Builtins.y2milestone("arch=s390 and remote_profile=true")
if Builtins.haskey(Profile.current, "dasd")
Builtins.y2milestone("dasd found")
- Call.Function(
- "dasd_auto",
- ["Import", Ops.get_map(Profile.current, "dasd", {})]
- )
+ if Call.Function("dasd_auto", ["Import", Ops.get_map(Profile.current, "dasd", {})])
+ #Activate imported disk bnc#883747
+ Call.Function("dasd_auto", [ "Write" ])
+ end
end
if Builtins.haskey(Profile.current, "zfcp")
Builtins.y2milestone("zfcp found")
- Call.Function(
- "zfcp_auto",
- ["Import", Ops.get_map(Profile.current, "zfcp", {})]
- )
+ if Call.Function("zfcp_auto", ["Import", Ops.get_map(Profile.current, "zfcp", {})])
+ #Activate imported disk bnc#883747
+ Call.Function("zfcp_auto", [ "Write" ])
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.40/src/modules/AutoinstDrive.rb new/autoyast2-3.1.42/src/modules/AutoinstDrive.rb
--- old/autoyast2-3.1.40/src/modules/AutoinstDrive.rb 2014-06-27 15:15:21.000000000 +0200
+++ new/autoyast2-3.1.42/src/modules/AutoinstDrive.rb 2014-07-04 15:50:28.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.40/src/modules/AutoinstPartPlan.rb new/autoyast2-3.1.42/src/modules/AutoinstPartPlan.rb
--- old/autoyast2-3.1.40/src/modules/AutoinstPartPlan.rb 2014-06-27 15:15:21.000000000 +0200
+++ new/autoyast2-3.1.42/src/modules/AutoinstPartPlan.rb 2014-07-04 15:50:28.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.40/src/modules/AutoinstPartition.rb new/autoyast2-3.1.42/src/modules/AutoinstPartition.rb
--- old/autoyast2-3.1.40/src/modules/AutoinstPartition.rb 2014-06-27 15:15:21.000000000 +0200
+++ new/autoyast2-3.1.42/src/modules/AutoinstPartition.rb 2014-07-04 15:50:28.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.40/src/modules/AutoinstStorage.rb new/autoyast2-3.1.42/src/modules/AutoinstStorage.rb
--- old/autoyast2-3.1.40/src/modules/AutoinstStorage.rb 2014-06-27 15:15:21.000000000 +0200
+++ new/autoyast2-3.1.42/src/modules/AutoinstStorage.rb 2014-07-04 15:50:28.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(
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
