Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2013-11-22 07:29:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-11-15 14:28:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2013-11-22 07:29:43.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 19 15:15:29 CET 2013 - [email protected] + +- removed code to translate EVMS device names during update (see + bnc#848821) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/package/yast2-storage.changes new/yast2-storage-3.1.2/package/yast2-storage.changes --- old/yast2-storage-3.1.2/package/yast2-storage.changes 2013-11-15 10:46:48.000000000 +0100 +++ new/yast2-storage-3.1.2/package/yast2-storage.changes 2013-11-19 15:19:42.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 19 15:15:29 CET 2013 - [email protected] + +- removed code to translate EVMS device names during update (see + bnc#848821) + +------------------------------------------------------------------- Wed Nov 13 15:38:35 CET 2013 - [email protected] - use correct binary prefix (bnc#849276) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/src/modules/Storage.rb new/yast2-storage-3.1.2/src/modules/Storage.rb --- old/yast2-storage-3.1.2/src/modules/Storage.rb 2013-11-15 10:46:48.000000000 +0100 +++ new/yast2-storage-3.1.2/src/modules/Storage.rb 2013-11-19 15:19:43.000000000 +0100 @@ -6414,16 +6414,6 @@ 0 ) == 9 - # convert EVMS names to LVM - # FIXME: add version checking, but does not seem necessary, since non-LVM - # installations will not be affected by this conversion at all - ret = Builtins.maplist(ret) do |n| - if Builtins.substring(n, 0, 15) == "/dev/evms/lvm2/" - n = Ops.add("/dev/", Builtins.substring(n, 15)) - end - n - end - # convert dmraid names to mdadm names mapping = GetDmraidToMdadm() if !mapping.empty? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/src/modules/StorageUpdate.rb new/yast2-storage-3.1.2/src/modules/StorageUpdate.rb --- old/yast2-storage-3.1.2/src/modules/StorageUpdate.rb 2013-11-15 10:46:48.000000000 +0100 +++ new/yast2-storage-3.1.2/src/modules/StorageUpdate.rb 2013-11-19 15:19:43.000000000 +0100 @@ -209,36 +209,6 @@ end - def UpdateFstabEvms2Lvm - Builtins.y2milestone("UpdateFstabEvms2Lvm migrating EVMS to LVM") - tabpath = Storage.PathToDestdir("/etc/fstab") - fstab = Partitions.GetFstab(tabpath) - line = 0 - n = "" - while Ops.less_or_equal(line, AsciiFile.NumLines(fstab)) - l = ( - fstab_ref = arg_ref(fstab); - _GetLine_result = AsciiFile.GetLine(fstab_ref, line); - fstab = fstab_ref.value; - _GetLine_result - ) - n = Ops.get_string(l, ["fields", 0], "") - if Builtins.substring(n, 0, 15) == "/dev/evms/lvm2/" - n = Ops.add("/dev/", Builtins.substring(n, 15)) - fstab_ref = arg_ref(fstab) - AsciiFile.ChangeLineField(fstab_ref, line, 0, n) - fstab = fstab_ref.value - end - line = Ops.add(line, 1) - end - fstab_ref = arg_ref(fstab) - AsciiFile.RewriteFile(fstab_ref, tabpath) - fstab = fstab_ref.value - - nil - end - - def UpdateMdadm Builtins.y2milestone("UpdateMdadm") cpath = Storage.PathToDestdir("/etc/mdadm.conf") @@ -719,10 +689,6 @@ UpdateFstabHotplugOption() end - # remove EVMS - # FIXME add appropriate condition if needed (does not seem so) - UpdateFstabEvms2Lvm() - UpdateFstabDmraidToMdadm() dm = Storage.BuildDiskmap(oldv) @@ -761,10 +727,6 @@ Ops.get_integer(oldv, "major", 0) == 9 && Ops.get_integer(oldv, "minor", 0) == 0 UpdateFstabIseriesVd() if Arch.board_iseries - cmd = "cd / && /sbin/insserv -r /etc/init.d/boot.evms" - Builtins.y2milestone("Update cmd %1", cmd) - bo = Convert.to_map(SCR.Execute(path(".target.bash_output"), cmd)) - Builtins.y2milestone("Update bo %1", bo) end if Ops.less_than(Ops.get_integer(oldv, "major", 0), 10) || Ops.get_integer(oldv, "major", 0) == 10 && -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
