Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at 2014-02-07 16:44:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-02-04 22:50:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes
2014-02-07 16:44:47.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Feb 05 18:12:05 CET 2014 - aschn...@suse.de
+
+- removed code setting MODULES_LOADED_ON_BOOT (bnc#838185)
+- version 3.1.9
+
+-------------------------------------------------------------------
+Wed Feb 05 09:32:34 CET 2014 - aschn...@suse.de
+
+- fixed typo in method name (bnc#862187)
+- version 3.1.8
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-3.1.7.tar.bz2
New:
----
yast2-storage-3.1.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.SYrMJk/_old 2014-02-07 16:44:47.000000000 +0100
+++ /var/tmp/diff_new_pack.SYrMJk/_new 2014-02-07 16:44:47.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 3.1.7
+Version: 3.1.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-storage-3.1.7.tar.bz2 -> yast2-storage-3.1.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.7/package/yast2-storage.changes
new/yast2-storage-3.1.9/package/yast2-storage.changes
--- old/yast2-storage-3.1.7/package/yast2-storage.changes 2014-02-03
14:19:06.000000000 +0100
+++ new/yast2-storage-3.1.9/package/yast2-storage.changes 2014-02-06
10:34:28.000000000 +0100
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Wed Feb 05 18:12:05 CET 2014 - aschn...@suse.de
+
+- removed code setting MODULES_LOADED_ON_BOOT (bnc#838185)
+- version 3.1.9
+
+-------------------------------------------------------------------
+Wed Feb 05 09:32:34 CET 2014 - aschn...@suse.de
+
+- fixed typo in method name (bnc#862187)
+- version 3.1.8
+
+-------------------------------------------------------------------
Mon Feb 03 12:44:35 CET 2014 - aschn...@suse.de
- include only devices know to libstorage in target-map
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.7/package/yast2-storage.spec
new/yast2-storage-3.1.9/package/yast2-storage.spec
--- old/yast2-storage-3.1.7/package/yast2-storage.spec 2014-02-03
14:19:06.000000000 +0100
+++ new/yast2-storage-3.1.9/package/yast2-storage.spec 2014-02-06
10:34:28.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 3.1.7
+Version: 3.1.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.7/src/clients/inst_prepdisk.rb
new/yast2-storage-3.1.9/src/clients/inst_prepdisk.rb
--- old/yast2-storage-3.1.7/src/clients/inst_prepdisk.rb 2014-02-03
14:19:06.000000000 +0100
+++ new/yast2-storage-3.1.9/src/clients/inst_prepdisk.rb 2014-02-06
10:34:28.000000000 +0100
@@ -102,7 +102,6 @@
@ret_val = :abort if @ret != 0
if Stage.initial
- Storage.WriteFstab
# If a kernel without initrd is booted, then there is a small window
# between mounting the root filesystem until /etc/init.d/boot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.7/src/modules/Storage.rb
new/yast2-storage-3.1.9/src/modules/Storage.rb
--- old/yast2-storage-3.1.7/src/modules/Storage.rb 2014-02-03
14:19:06.000000000 +0100
+++ new/yast2-storage-3.1.9/src/modules/Storage.rb 2014-02-06
10:34:28.000000000 +0100
@@ -1730,7 +1730,7 @@
Ops.set(p, "raid_inactive", true) if info.inactive
p["devices"] = info.devices.to_a
- p["spares"] = info.spares.to_a if !info.spares.empty
+ p["spares"] = info.spares.to_a if !info.spares.empty?
Ops.set(
c,
@@ -3557,7 +3557,6 @@
ret = @sint.modifyFileLoop(dev, file, !create, sizeK)
Builtins.y2error("UpdateLoop sint ret:%1", ret) if ret<0
UpdateTargetMapDisk("/dev/loop")
- HandleModulesOnBoot(GetTargetMap())
ret == 0
end
@@ -6089,64 +6088,6 @@
end
- def HandleModulesOnBoot(targetMap)
- targetMap = deep_copy(targetMap)
- ml = Builtins.filter(
- Builtins.splitstring(
- Misc.SysconfigRead(
- path(".sysconfig.kernel.MODULES_LOADED_ON_BOOT"),
- ""
- ),
- " \t"
- )
- ) { |e| Ops.greater_than(Builtins.size(e), 0) }
- Builtins.y2milestone("HandleModulesOnBoot ml %1", ml)
- need_cryptoloop = false
- need_fish2 = false
- Builtins.foreach(targetMap) do |disk, e|
- Builtins.foreach(Ops.get_list(e, "partitions", [])) do |p|
- if Ops.get_boolean(p, "noauto", false) &&
- Ops.get_symbol(p, "enc_type", :none) != :none
- if Ops.get_symbol(p, "enc_type", :none) == :twofish
- need_cryptoloop = true
- elsif Ops.get_symbol(p, "enc_type", :none) == :twofish_old ||
- Ops.get_symbol(p, "enc_type", :none) == :twofish_256_old
- need_fish2 = true
- end
- end
- end
- end
- Builtins.y2milestone(
- "HandleModulesOnBoot need_fish2 %1 need_cryptoloop %2",
- need_fish2,
- need_cryptoloop
- )
- if need_fish2 && Builtins.find(ml) { |e| e == "loop_fish2" } == nil
- ml = Builtins.add(ml, "loop_fish2")
- SCR.Write(
- path(".sysconfig.kernel.MODULES_LOADED_ON_BOOT"),
- Builtins.mergestring(ml, " ")
- )
- end
- if need_cryptoloop && Builtins.find(ml) { |e| e == "cryptoloop" } == nil
- ml = Builtins.add(ml, "cryptoloop")
- SCR.Write(
- path(".sysconfig.kernel.MODULES_LOADED_ON_BOOT"),
- Builtins.mergestring(ml, " ")
- )
- end
- if need_cryptoloop && Builtins.find(ml) { |e| e == "twofish" } == nil
- ml = Builtins.add(ml, "twofish")
- SCR.Write(
- path(".sysconfig.kernel.MODULES_LOADED_ON_BOOT"),
- Builtins.mergestring(ml, " ")
- )
- end
-
- nil
- end
-
-
# Adds an entry into the fstab
#
# @param map entry
@@ -6193,15 +6134,6 @@
end
- # Writes fstab to the disk
- def WriteFstab
- Builtins.y2milestone("WriteFstab called")
- HandleModulesOnBoot(GetTargetMap())
-
- nil
- end
-
-
def SpecialBootHandling(tg)
tg = deep_copy(tg)
have_ppc_boot = false
@@ -6567,8 +6499,6 @@
target_map = GetTargetMap()
- HandleModulesOnBoot(target_map) if Stage.initial
-
need_crypt = false
need_md = false
need_lvm = false
@@ -7371,7 +7301,6 @@
publish :function => :PathToDestdir, :type => "string (string)"
publish :function => :ActivateHld, :type => "void (boolean)"
publish :function => :ActivateMultipath, :type => "void (boolean)"
- publish :function => :WriteFstab, :type => "void ()"
publish :function => :SpecialBootHandling, :type => "map <string, map>
(map <string, map>)"
publish :function => :PerformLosetup, :type => "boolean (map &, boolean)"
publish :function => :DetectFs, :type => "symbol (string)"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
