Hello community, here is the log from the commit of package yast2-reipl for openSUSE:Factory checked in at 2014-05-21 16:32:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-reipl (Old) and /work/SRC/openSUSE:Factory/.yast2-reipl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-reipl" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-reipl/yast2-reipl.changes 2014-05-06 14:04:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-reipl.new/yast2-reipl.changes 2014-05-21 16:32:54.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 21 09:46:40 UTC 2014 - [email protected] + +- do not call reipl mutliple time during installation + (patch by Ihno) +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-reipl-3.1.3.tar.bz2 New: ---- yast2-reipl-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-reipl.spec ++++++ --- /var/tmp/diff_new_pack.THKZM3/_old 2014-05-21 16:32:58.000000000 +0200 +++ /var/tmp/diff_new_pack.THKZM3/_new 2014-05-21 16:32:58.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-reipl -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-reipl-3.1.3.tar.bz2 -> yast2-reipl-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-reipl-3.1.3/package/yast2-reipl.changes new/yast2-reipl-3.1.4/package/yast2-reipl.changes --- old/yast2-reipl-3.1.3/package/yast2-reipl.changes 2014-05-05 17:54:51.000000000 +0200 +++ new/yast2-reipl-3.1.4/package/yast2-reipl.changes 2014-05-21 13:19:21.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 21 09:46:40 UTC 2014 - [email protected] + +- do not call reipl mutliple time during installation + (patch by Ihno) +- 3.1.4 + +------------------------------------------------------------------- Mon May 5 15:42:32 UTC 2014 - [email protected] - call chreipl without target prefix as it is called in chroot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-reipl-3.1.3/package/yast2-reipl.spec new/yast2-reipl-3.1.4/package/yast2-reipl.spec --- old/yast2-reipl-3.1.3/package/yast2-reipl.spec 2014-05-05 17:54:51.000000000 +0200 +++ new/yast2-reipl-3.1.4/package/yast2-reipl.spec 2014-05-21 13:19:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-reipl -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-reipl-3.1.3/src/Makefile.am new/yast2-reipl-3.1.4/src/Makefile.am --- old/yast2-reipl-3.1.3/src/Makefile.am 2014-05-05 17:54:51.000000000 +0200 +++ new/yast2-reipl-3.1.4/src/Makefile.am 2014-05-21 13:19:21.000000000 +0200 @@ -7,7 +7,6 @@ clients/reipl.rb \ clients/reipl_auto.rb \ clients/reipl_bootloader_finish.rb \ - clients/inst_reiplauto.rb \ clients/reipl_finish.rb \ clients/reipl_proposal.rb \ clients/inst_reipl.rb @@ -24,4 +23,4 @@ EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(desktop_DATA) -include $(top_srcdir)/Makefile.am.common \ No newline at end of file +include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-reipl-3.1.3/src/clients/inst_reiplauto.rb new/yast2-reipl-3.1.4/src/clients/inst_reiplauto.rb --- old/yast2-reipl-3.1.3/src/clients/inst_reiplauto.rb 2014-05-05 17:54:51.000000000 +0200 +++ new/yast2-reipl-3.1.4/src/clients/inst_reiplauto.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ -# encoding: utf-8 - -# ------------------------------------------------------------------------------ -# Copyright (c) 2006 Novell, Inc. All Rights Reserved. -# -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of version 2 of the GNU General Public License as published by the -# Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, you may find -# current contact information at www.novell.com. -# ------------------------------------------------------------------------------ - -# File: clients/inst_reiplauto.ycp -# Package: Automatic configuration of reipl -# Summary: Main file -# Authors: Mark Hamzy <[email protected]> -# -# $Id$ -# -# Main file for reipl configuration. Uses all other files. -module Yast - class InstReiplautoClient < Client - def main - #** - # <h3>Configuration of reipl</h3> - - textdomain "reipl" - - Yast.import "Reipl" - Yast.import "GetInstArgs" - Yast.import "Mode" - Yast.import "Wizard" - Yast.import "FileUtils" - Yast.import "Confirm" - Yast.import "Storage" - # The main () - Builtins.y2milestone("inst_reiplauto started ----------------------------------------") - - @args = GetInstArgs.argmap - - # first run unless explicitelly mentioned - @args["first_run"] = "yes" if @args["first_run"] != "no" - - Wizard.HideAbortButton if Mode.mode == "firstboot" - - @rc = true - - @configuration = Reipl.ReadState - - if [email protected]? - if !Reipl.IPL_from_boot_zipl - Builtins.y2error("Could not modify reipl configuration") - end - else - Builtins.y2error("Could not read reipl configuration") - end - - # Finish - Builtins.y2milestone("inst_reiplauto finished ----------------------------------------") - - :next - - # EOF - end - end -end - -Yast::InstReiplautoClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-reipl-3.1.3/src/clients/reipl_bootloader_finish.rb new/yast2-reipl-3.1.4/src/clients/reipl_bootloader_finish.rb --- old/yast2-reipl-3.1.3/src/clients/reipl_bootloader_finish.rb 2014-05-05 17:54:51.000000000 +0200 +++ new/yast2-reipl-3.1.4/src/clients/reipl_bootloader_finish.rb 2014-05-21 13:19:21.000000000 +0200 @@ -55,11 +55,7 @@ Builtins.y2milestone("newConfiguration['method'] : %1", Ops.get_string(@newConfiguration, "method", "ERROR")) if Ops.get_string(@newConfiguration, "method", "ERROR") == "ccw" Builtins.y2milestone("making ccw ipl text") - @dev = Builtins.substring( - Ops.get_string(@newCcwMap, "device", ""), - 4, - 4 - ) + @dev = Builtins.substring(Ops.get_string(@newCcwMap, "device", ""), 4, 4) # TRANSLATORS: part of a shutdown message # %1 is replaced with a device name @@ -74,11 +70,7 @@ ) elsif Ops.get_string(@newConfiguration, "method", "ERROR") == "fcp" Builtins.y2milestone("making fcp ipl text") - @dev = Builtins.substring( - Ops.get_string(@newFcpMap, "device", ""), - 4, - 4 - ) + @dev = Builtins.substring(Ops.get_string(@newFcpMap, "device", ""), 4, 4) @wwpn = Ops.get_string(@newFcpMap, "wwpn", "") @lun = Ops.get_string(@newFcpMap, "lun", "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-reipl-3.1.3/src/modules/Reipl.rb new/yast2-reipl-3.1.4/src/modules/Reipl.rb --- old/yast2-reipl-3.1.3/src/modules/Reipl.rb 2014-05-05 17:54:51.000000000 +0200 +++ new/yast2-reipl-3.1.4/src/modules/Reipl.rb 2014-05-21 13:19:21.000000000 +0200 @@ -123,21 +123,9 @@ def ReadState configuration = {} Builtins.y2milestone("ReadState: The beginngn") - Ops.set( - configuration, - "ccw", - { "device" => "", "loadparm" => "", "parm" => "" } - ) - Ops.set( - configuration, - "fcp", - { "device" => "", "wwpn" => "", "lun" => "", "bootprog" => "", "br_lba" => "", "bootparms" => "" } - ) - Ops.set( - configuration, - "nss", - { "name" => "", "loadparm" => "", "parm" => "" } - ) + Ops.set(configuration, "ccw", { "device" => "", "loadparm" => "", "parm" => "" }) + Ops.set(configuration, "fcp", { "device" => "", "wwpn" => "", "lun" => "", "bootprog" => "", "br_lba" => "", "bootparms" => "" }) + Ops.set(configuration, "nss", { "name" => "", "loadparm" => "", "parm" => "" }) result = Yast::SCR.Execute(path(".target.bash_output"), "lsreipl") raise "Calling lsreipl failed with #{result["stderr"]}" unless result["exit"].zero? @@ -160,7 +148,6 @@ Ops.set(ccw_map, "br_lbr", Builtins.deletechars(Convert.to_string(lsreipl_lines[5][/[0-9]*$/]), "\n ")) Ops.set(ccw_map, "bootparms", Builtins.deletechars(Convert.to_string(lsreipl_lines[6][/".*"*$/]), "\n \"")) Ops.set(configuration, "fcp", fcp_map) - end configuration["method"] = type -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
