Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2016-02-25 21:44:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2016-01-13 22:44:05.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2016-02-25 21:44:20.000000000 +0100
@@ -1,0 +2,13 @@
+Sun Feb 21 21:15:02 UTC 2016 - [email protected]
+
+- bnc#960703
+ - network service setup moved into yast2-network package.
+- 3.1.169
+
+-------------------------------------------------------------------
+Wed Feb 17 16:03:56 UTC 2016 - [email protected]
+
+- Remove autoyast clone button (fate#317970)
+- 3.1.168
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.167.tar.bz2
New:
----
yast2-installation-3.1.169.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.lcY1Ny/_old 2016-02-25 21:44:21.000000000 +0100
+++ /var/tmp/diff_new_pack.lcY1Ny/_new 2016-02-25 21:44:21.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.167
+Version: 3.1.169
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -81,8 +81,8 @@
# Systemd default target and services
Requires: yast2-services-manager
-# Yast::Remote
-Requires: yast2-network
+# Network service setup moved into yast2-network
+Requires: yast2-network >= 3.1.143
# Only in inst-sys
# Requires: yast2-add-on
++++++ yast2-installation-3.1.167.tar.bz2 -> yast2-installation-3.1.169.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.167/package/yast2-installation.changes
new/yast2-installation-3.1.169/package/yast2-installation.changes
--- old/yast2-installation-3.1.167/package/yast2-installation.changes
2016-01-11 16:36:21.000000000 +0100
+++ new/yast2-installation-3.1.169/package/yast2-installation.changes
2016-02-23 09:54:08.000000000 +0100
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Sun Feb 21 21:15:02 UTC 2016 - [email protected]
+
+- bnc#960703
+ - network service setup moved into yast2-network package.
+- 3.1.169
+
+-------------------------------------------------------------------
+Wed Feb 17 16:03:56 UTC 2016 - [email protected]
+
+- Remove autoyast clone button (fate#317970)
+- 3.1.168
+
+-------------------------------------------------------------------
Thu Dec 22 15:53:34 CET 2015 - [email protected]
- Removing network dependencies in the service files in order to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.167/package/yast2-installation.spec
new/yast2-installation-3.1.169/package/yast2-installation.spec
--- old/yast2-installation-3.1.167/package/yast2-installation.spec
2016-01-11 16:36:21.000000000 +0100
+++ new/yast2-installation-3.1.169/package/yast2-installation.spec
2016-02-23 09:54:08.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.167
+Version: 3.1.169
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -78,8 +78,8 @@
# Systemd default target and services
Requires: yast2-services-manager
-# Yast::Remote
-Requires: yast2-network
+# Network service setup moved into yast2-network
+Requires: yast2-network >= 3.1.143
# Only in inst-sys
# Requires: yast2-add-on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.167/src/Makefile.am
new/yast2-installation-3.1.169/src/Makefile.am
--- old/yast2-installation-3.1.167/src/Makefile.am 2016-01-11
16:36:21.000000000 +0100
+++ new/yast2-installation-3.1.169/src/Makefile.am 2016-02-23
09:54:08.000000000 +0100
@@ -10,8 +10,6 @@
client_DATA = \
clients/cio_ignore_finish.rb \
clients/cio_ignore_proposal.rb \
- clients/clone_proposal.rb \
- clients/clone_finish.rb \
clients/copy_files_finish.rb \
clients/copy_logs_finish.rb \
clients/copy_systemfiles_finish.rb \
@@ -107,7 +105,6 @@
ylibdir = "${yast2dir}/lib/installation"
ylib_DATA = \
lib/installation/cio_ignore.rb \
- lib/installation/clone_settings.rb \
lib/installation/copy_logs_finish.rb \
lib/installation/minimal_installation.rb \
lib/installation/prep_shrink.rb \
@@ -118,8 +115,6 @@
ylibclientdir = "${yast2dir}/lib/installation/clients"
ylibclient_DATA = \
- lib/installation/clients/clone_finish.rb \
- lib/installation/clients/clone_proposal.rb \
lib/installation/clients/copy_files_finish.rb \
lib/installation/clients/copy_systemfiles_finish.rb \
lib/installation/clients/deploy_image_auto.rb \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.167/src/clients/clone_finish.rb
new/yast2-installation-3.1.169/src/clients/clone_finish.rb
--- old/yast2-installation-3.1.167/src/clients/clone_finish.rb 2016-01-11
16:36:21.000000000 +0100
+++ new/yast2-installation-3.1.169/src/clients/clone_finish.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-require "installation/clients/clone_finish"
-Yast::CloneFinishClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.167/src/clients/clone_proposal.rb
new/yast2-installation-3.1.169/src/clients/clone_proposal.rb
--- old/yast2-installation-3.1.167/src/clients/clone_proposal.rb
2016-01-11 16:36:21.000000000 +0100
+++ new/yast2-installation-3.1.169/src/clients/clone_proposal.rb
1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-require "installation/clients/clone_proposal"
-Yast::CloneProposalClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.167/src/lib/installation/clients/clone_finish.rb
new/yast2-installation-3.1.169/src/lib/installation/clients/clone_finish.rb
--- old/yast2-installation-3.1.167/src/lib/installation/clients/clone_finish.rb
2016-01-11 16:36:21.000000000 +0100
+++ new/yast2-installation-3.1.169/src/lib/installation/clients/clone_finish.rb
1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-# encoding: utf-8
-
-#
------------------------------------------------------------------------------
-# Copyright (c) 2014 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.
-#
------------------------------------------------------------------------------
-
-module Yast
- import "Installation"
-
- class CloneFinishClient < Client
- def main
- textdomain "installation"
-
- func = ""
-
- # Check arguments
- args = WFM.Args
- func = args[0] if args.size > 0 && args[0].is_a?(::String)
-
- Builtins.y2milestone("starting clone_finish")
- Builtins.y2debug("func=%1", func)
-
- case func
- when "Info"
- return {
- "steps" => 1,
- # progress step title
- "title" => _(
- "Generating AutoYaST profile if needed..."
- ),
- "when" => [:installation]
- }
- when "Write"
- WFM.call("clone_proposal", ["Write"])
-
- # copy from insts_sys to target system
- if File.exist? "/root/autoinst.xml"
- WFM.Execute(path(".local.bash"), "cp /root/autoinst.xml
#{Installation.destdir}/root/autoinst.xml")
- end
-
- Builtins.y2milestone("clone_finish Write finished")
- else
- raise "unknown function: #{func}"
- end
-
- nil
- end
- end
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.167/src/lib/installation/clients/clone_proposal.rb
new/yast2-installation-3.1.169/src/lib/installation/clients/clone_proposal.rb
---
old/yast2-installation-3.1.167/src/lib/installation/clients/clone_proposal.rb
2016-01-11 16:36:21.000000000 +0100
+++
new/yast2-installation-3.1.169/src/lib/installation/clients/clone_proposal.rb
1970-01-01 01:00:00.000000000 +0100
@@ -1,120 +0,0 @@
-require "installation/clone_settings"
-
-module Yast
- import "UI"
- import "Label"
-
- class CloneProposalClient < Client
- CLONE_ENABLE_LINK = "clone_enable"
- CLONE_DISABLE_LINK = "clone_disable"
- CLONE_ACTION_ID = "clone"
-
- def main
- textdomain "installation"
-
- @clone_settings = ::Installation::CloneSettings.instance
- Yast.import "Installation"
- Yast.import "ProductFeatures"
-
- func = WFM.Args[0]
- param = WFM.Args[1] || {}
-
- product_clone_active = ProductFeatures.GetBooleanFeature(
- "globals",
- "enable_clone"
- )
- if @clone_settings.enabled.nil?
- y2milestone("Set default value for cloning")
- @clone_settings.enabled = product_clone_active
- end
-
- case func
- when "MakeProposal"
- @clone_settings.enabled = product_clone_active if param["force_reset"]
-
- ret = {
- "preformatted_proposal" => proposal_text,
- "links" => [CLONE_ENABLE_LINK, CLONE_DISABLE_LINK],
- # TRANSLATORS: help text
- "help" => _(
- "<p>Use <b>Clone System Settings</b> if you want to create an
AutoYaST profile.\n" \
- "AutoYaST is a way to do a complete SUSE Linux installation
without user interaction. AutoYaST\n" \
- "needs a profile to know what the installed system should look
like. If this option is\n" \
- "selected, a profile of the current system is stored in
<tt>/root/autoinst.xml</tt>.</p>"
- )
- }
- when "AskUser"
- chosen_id = Ops.get(param, "chosen_id")
- Builtins.y2milestone(
- "Clone proposal change requested, id %1",
- chosen_id
- )
-
- case chosen_id
- when CLONE_DISABLE_LINK
- @clone_settings.enabled = false
- when CLONE_ENABLE_LINK
- @clone_settings.enabled = true
- when CLONE_ACTION_ID
- @clone_settings.enabled = Popup.YesNo(
- _("Write AutoYaST profile to /root/autoinst.xml" \
- "at the end of installation?")
- )
- else
- raise "Unexpected value #{chosen_id}"
- end
-
- ret = { "workflow_sequence" => :next }
- when "Description"
- ret = {
- # this is a heading
- "rich_text_title" => _("Clone System Configuration"),
- # this is a menu entry
- "menu_title" => _("&Clone System Configuration"),
- "id" => CLONE_ACTION_ID
- }
- when "Write"
- if param["force"] || @clone_settings.enabled?
- # keep mode, cloning set it to autoinst_config, but we need to
continue
- # installation with original one(BNC#861520)
- options = {}
- options["target_path"] = param["target_path"] if param["target_path"]
- mode = Mode.mode
- WFM.call("clone_system", [options])
- Mode.SetMode(mode)
- end
- ret = true
- else
- raise "Unsuported action #{func}"
- end
-
- ret
- end
-
- def proposal_text
- ret = "<ul><li>\n"
-
- if @clone_settings.enabled?
- ret << Builtins.sformat(
- # TRANSLATORS: Installation overview
- # IMPORTANT: Please, do not change the HTML link <a
href="...">...</a>, only visible text
- _(
- "The AutoYaST profile will be written under /root/autoinst.xml (<a
href=\"%1\">do not write it</a>)."
- ),
- CLONE_DISABLE_LINK
- )
- else
- ret << Builtins.sformat(
- # TRANSLATORS: Installation overview
- # IMPORTANT: Please, do not change the HTML link <a
href="...">...</a>, only visible text
- _(
- "The AutoYaST profile will not be saved (<a href=\"%1\">write
it</a>)."
- ),
- CLONE_ENABLE_LINK
- )
- end
-
- ret << "</li></ul>\n"
- end
- end unless defined? (CloneProposalClient) # avoid class redefinition if
reevaluated
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.167/src/lib/installation/clients/inst_deploy_image.rb
new/yast2-installation-3.1.169/src/lib/installation/clients/inst_deploy_image.rb
---
old/yast2-installation-3.1.167/src/lib/installation/clients/inst_deploy_image.rb
2016-01-11 16:36:21.000000000 +0100
+++
new/yast2-installation-3.1.169/src/lib/installation/clients/inst_deploy_image.rb
2016-02-23 09:54:08.000000000 +0100
@@ -19,8 +19,6 @@
# current contact information at www.novell.com.
#
------------------------------------------------------------------------------
-require "installation/clone_settings"
-
module Yast
class InstDeployImageClient < Client
include Yast::Logger
@@ -60,13 +58,6 @@
end
end
- if ::Installation::CloneSettings.instance.enabled?
- log.info "Cloning enabled, storing the current package selection"
- # store the software selection for AutoYaST for later (bsc#956325)
- Yast.import "AutoinstSoftware"
- AutoinstSoftware.SavePackageSelection
- end
-
Builtins.y2milestone("Deploying images")
SlideShow.MoveToStage("images")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.167/src/lib/installation/clients/inst_finish.rb
new/yast2-installation-3.1.169/src/lib/installation/clients/inst_finish.rb
--- old/yast2-installation-3.1.167/src/lib/installation/clients/inst_finish.rb
2016-01-11 16:36:21.000000000 +0100
+++ new/yast2-installation-3.1.169/src/lib/installation/clients/inst_finish.rb
2016-02-23 09:54:08.000000000 +0100
@@ -149,7 +149,6 @@
"autoinst_scripts1",
"copy_files",
"copy_systemfiles",
- "clone",
# For live installer only
Mode.live_installation ? "live_copy_files" : "",
"switch_scr"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.167/src/lib/installation/clients/network_finish.rb
new/yast2-installation-3.1.169/src/lib/installation/clients/network_finish.rb
---
old/yast2-installation-3.1.167/src/lib/installation/clients/network_finish.rb
2016-01-11 16:36:21.000000000 +0100
+++
new/yast2-installation-3.1.169/src/lib/installation/clients/network_finish.rb
2016-02-23 09:54:08.000000000 +0100
@@ -35,13 +35,7 @@
def main
textdomain "installation"
- Yast.import "Installation"
Yast.import "ModulesConf"
- Yast.import "Arch"
- Yast.import "Linuxrc"
- Yast.import "String"
- Yast.import "NetworkService"
- Yast.import "Lan"
@ret = nil
@func = ""
@@ -58,8 +52,6 @@
end
Builtins.y2milestone("starting network_finish")
- Builtins.y2debug("func=%1", @func)
- Builtins.y2debug("param=%1", @param)
if @func == "Info"
return {
@@ -69,15 +61,6 @@
"when" => [:installation, :autoinst]
}
elsif @func == "Write"
-
- if Lan.UseNetworkManager
- NetworkService.use_network_manager
- else
- NetworkService.use_wicked
- end
-
- NetworkService.EnableDisableNow
-
Builtins.y2milestone("Save network configuration")
WFM.CallFunction("save_network")
# false == don't force
@@ -87,7 +70,6 @@
@ret = nil
end
- Builtins.y2debug("ret=%1", @ret)
Builtins.y2milestone("network_finish finished")
deep_copy(@ret)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.167/src/lib/installation/clone_settings.rb
new/yast2-installation-3.1.169/src/lib/installation/clone_settings.rb
--- old/yast2-installation-3.1.167/src/lib/installation/clone_settings.rb
2016-01-11 16:36:21.000000000 +0100
+++ new/yast2-installation-3.1.169/src/lib/installation/clone_settings.rb
1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-require "singleton"
-
-module Installation
- # helper module to make proposal value persistent
- class CloneSettings
- include Singleton
-
- attr_accessor :enabled
- alias_method :enabled?, :enabled
- end
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.167/src/lib/installation/proposal_runner.rb
new/yast2-installation-3.1.169/src/lib/installation/proposal_runner.rb
--- old/yast2-installation-3.1.167/src/lib/installation/proposal_runner.rb
2016-01-11 16:36:21.000000000 +0100
+++ new/yast2-installation-3.1.169/src/lib/installation/proposal_runner.rb
2016-02-23 09:54:08.000000000 +0100
@@ -74,9 +74,6 @@
return :auto
end
- args = (Yast::WFM.Args || []).first || {}
- @hide_export = args["hide_export"]
-
log.info "Installation step #2"
@proposal_mode = Yast::GetInstArgs.proposal
@@ -210,9 +207,6 @@
)
make_proposal(true, false) # force_reset
- when :export_config
- export_config
-
when :skip, :dontskip
handle_skip
@@ -247,16 +241,6 @@
submod_descriptions_and_build_menu
end
- def export_config
- path = Yast::UI.AskForSaveFileName("/", "*.xml", _("Location of Stored
Configuration"))
- return unless path
-
- # force write, so it always write profile even if user do not want
- # to store profile after installation
- Yast::WFM.CallFunction("clone_proposal", ["Write", "force" => true,
"target_path" => path])
- raise _("Failed to store configuration. Details can be found in log.")
unless File.exist?(path)
- end
-
def handle_skip
if Yast::UI.QueryWidget(Id(:skip), :Value)
# User doesn't want to use any of the settings
@@ -654,21 +638,14 @@
def build_dialog
headline = @store.headline
+ change_point = Empty()
if Yast::UI.TextMode()
change_point = ReplacePoint(
Id(:rep_menu),
# menu button
MenuButton(Id(:menu_dummy), _("&Change..."), [Item(Id(:dummy), "")])
- )
- elsif @hide_export
- change_point = Empty()
- else
- change_point = PushButton(
- Id(:export_config),
- # menu button
- _("&Export Configuration")
- )
+ )
end
# change menu
@@ -778,7 +755,6 @@
# menu button item
menu_list << Item(Id(:reset_to_defaults), _("&Reset to defaults"))
- menu_list << Item(Id(:export_config), _("&Export Configuration")) unless
@hide_export
# menu button
Yast::UI.ReplaceWidget(
