Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2014-02-21 13:48:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-02-04 22:50:36.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2014-02-21 13:48:14.000000000 +0100
@@ -1,0 +2,69 @@
+Fri Feb 21 09:16:18 UTC 2014 - [email protected]
+
+- ssh installation: fix network start after reboot (bnc#850446)
+- 3.1.39
+
+-------------------------------------------------------------------
+Wed Feb 19 15:22:00 CET 2014 - [email protected]
+
+- Prevent from re-defining CopyFilesFinishClient class (bnc#864631)
+- 3.1.38
+
+-------------------------------------------------------------------
+Wed Feb 19 14:51:24 CET 2014 - [email protected]
+
+- Writing bootloader as late as possible, several configs need to
+ be written and coppied to the installed system first (bnc#860089)
+- 3.1.37
+
+-------------------------------------------------------------------
+Tue Feb 18 17:09:08 CET 2014 - [email protected]
+
+- Copying all udev rules from inst-sys to installed system
+ (bnc#860089)
+- 3.1.36
+
+-------------------------------------------------------------------
+Mon Feb 17 13:45:08 UTC 2014 - [email protected]
+
+- fix detection if ssh daemon run otherwise ssh installation do not
+ reboot after first stage(BNC#864260)
+- 3.1.35
+
+-------------------------------------------------------------------
+Wed Feb 12 11:44:20 UTC 2014 - [email protected]
+
+- fix namespace collision that cause error in installation
+- 3.1.34
+
+-------------------------------------------------------------------
+Mon Feb 11 15:26:47 UTC 2014 - [email protected]
+
+- keep proper installation mode after cloning(BNC#861520)
+- 3.1.33
+
+-------------------------------------------------------------------
+Tue Feb 11 14:55:36 UTC 2014 - [email protected]
+
+- fix dependencies to properly require new ruby bindings
+- 3.1.32
+
+-------------------------------------------------------------------
+Mon Feb 10 14:31:52 UTC 2014 - [email protected]
+
+- removed unused release_notes_popup.rb
+
+
+- Remove initialisation of Report in autoinst mode from
+ inst_system_analysis. Not needed any more since autoyast Profile
+ is now processed before inst_system_analysis gets called
+ (bnc#862829).
+- 3.1.31
+
+-------------------------------------------------------------------
+Fri Feb 7 09:36:00 UTC 2014 - [email protected]
+
+- Implement minimal installation feature (FATE#313149)
+- 3.1.30
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.29.tar.bz2
New:
----
yast2-installation-3.1.39.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.otQmH9/_old 2014-02-21 13:48:15.000000000 +0100
+++ /var/tmp/diff_new_pack.otQmH9/_new 2014-02-21 13:48:15.000000000 +0100
@@ -17,14 +17,14 @@
Name: yast2-installation
-Version: 3.1.29
+Version: 3.1.39
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Url: http://github.com/yast/yast-installation
-Requires: yast2-ruby-bindings >= 1.0.0
+Requires: yast2-ruby-bindings >= 3.1.8
Summary: YaST2 - Installation Parts
License: GPL-2.0
++++++ yast2-installation-3.1.29.tar.bz2 -> yast2-installation-3.1.39.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.29/package/yast2-installation.changes
new/yast2-installation-3.1.39/package/yast2-installation.changes
--- old/yast2-installation-3.1.29/package/yast2-installation.changes
2014-02-03 16:35:05.000000000 +0100
+++ new/yast2-installation-3.1.39/package/yast2-installation.changes
2014-02-21 10:41:10.000000000 +0100
@@ -1,4 +1,73 @@
-------------------------------------------------------------------
+Fri Feb 21 09:16:18 UTC 2014 - [email protected]
+
+- ssh installation: fix network start after reboot (bnc#850446)
+- 3.1.39
+
+-------------------------------------------------------------------
+Wed Feb 19 15:22:00 CET 2014 - [email protected]
+
+- Prevent from re-defining CopyFilesFinishClient class (bnc#864631)
+- 3.1.38
+
+-------------------------------------------------------------------
+Wed Feb 19 14:51:24 CET 2014 - [email protected]
+
+- Writing bootloader as late as possible, several configs need to
+ be written and coppied to the installed system first (bnc#860089)
+- 3.1.37
+
+-------------------------------------------------------------------
+Tue Feb 18 17:09:08 CET 2014 - [email protected]
+
+- Copying all udev rules from inst-sys to installed system
+ (bnc#860089)
+- 3.1.36
+
+-------------------------------------------------------------------
+Mon Feb 17 13:45:08 UTC 2014 - [email protected]
+
+- fix detection if ssh daemon run otherwise ssh installation do not
+ reboot after first stage(BNC#864260)
+- 3.1.35
+
+-------------------------------------------------------------------
+Wed Feb 12 11:44:20 UTC 2014 - [email protected]
+
+- fix namespace collision that cause error in installation
+- 3.1.34
+
+-------------------------------------------------------------------
+Mon Feb 11 15:26:47 UTC 2014 - [email protected]
+
+- keep proper installation mode after cloning(BNC#861520)
+- 3.1.33
+
+-------------------------------------------------------------------
+Tue Feb 11 14:55:36 UTC 2014 - [email protected]
+
+- fix dependencies to properly require new ruby bindings
+- 3.1.32
+
+-------------------------------------------------------------------
+Mon Feb 10 14:31:52 UTC 2014 - [email protected]
+
+- removed unused release_notes_popup.rb
+
+
+- Remove initialisation of Report in autoinst mode from
+ inst_system_analysis. Not needed any more since autoyast Profile
+ is now processed before inst_system_analysis gets called
+ (bnc#862829).
+- 3.1.31
+
+-------------------------------------------------------------------
+Fri Feb 7 09:36:00 UTC 2014 - [email protected]
+
+- Implement minimal installation feature (FATE#313149)
+- 3.1.30
+
+-------------------------------------------------------------------
Mon Feb 3 14:36:34 UTC 2014 - [email protected]
- fix false positive errors in log for easier debugging in future
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.29/package/yast2-installation.spec
new/yast2-installation-3.1.39/package/yast2-installation.spec
--- old/yast2-installation-3.1.29/package/yast2-installation.spec
2014-02-03 16:35:05.000000000 +0100
+++ new/yast2-installation-3.1.39/package/yast2-installation.spec
2014-02-21 10:41:10.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.29
+Version: 3.1.39
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -26,7 +26,7 @@
Group: System/YaST
License: GPL-2.0
Url: http://github.com/yast/yast-installation
-Requires: yast2-ruby-bindings >= 1.0.0
+Requires: yast2-ruby-bindings >= 3.1.8
Summary: YaST2 - Installation Parts
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.29/src/Makefile.am
new/yast2-installation-3.1.39/src/Makefile.am
--- old/yast2-installation-3.1.29/src/Makefile.am 2014-02-03
16:35:05.000000000 +0100
+++ new/yast2-installation-3.1.39/src/Makefile.am 2014-02-21
10:41:10.000000000 +0100
@@ -59,7 +59,6 @@
clients/pre_umount_finish.rb \
clients/proxy_finish.rb \
clients/random_finish.rb \
- clients/release_notes_popup.rb \
clients/save_config_finish.rb \
clients/save_hw_status_finish.rb \
clients/ssh_service_finish.rb \
@@ -103,7 +102,8 @@
ylibdir = "${yast2dir}/lib/installation"
ylib_DATA = \
- lib/installation/clone_settings.rb
+ lib/installation/clone_settings.rb \
+ lib/installation/minimal_installation.rb
EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA)
$(schemafiles_DATA) $(desktop_DATA) $(fillup_DATA) $(ylib_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.29/src/clients/clone_proposal.rb
new/yast2-installation-3.1.39/src/clients/clone_proposal.rb
--- old/yast2-installation-3.1.29/src/clients/clone_proposal.rb 2014-02-03
16:35:05.000000000 +0100
+++ new/yast2-installation-3.1.39/src/clients/clone_proposal.rb 2014-02-21
10:41:10.000000000 +0100
@@ -72,7 +72,11 @@
}
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)
+ mode = Mode.mode
WFM.call "clone_system"
+ Mode.SetMode(mode)
end
ret = true
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.29/src/clients/copy_files_finish.rb
new/yast2-installation-3.1.39/src/clients/copy_files_finish.rb
--- old/yast2-installation-3.1.29/src/clients/copy_files_finish.rb
2014-02-03 16:35:05.000000000 +0100
+++ new/yast2-installation-3.1.39/src/clients/copy_files_finish.rb
2014-02-21 10:41:10.000000000 +0100
@@ -28,10 +28,10 @@
# Authors:
# Jiri Srain <[email protected]>
#
-# $Id$
-#
module Yast
class CopyFilesFinishClient < Client
+ include Yast::Logger
+
def main
Yast.import "Pkg"
Yast.import "UI"
@@ -366,56 +366,34 @@
nil
end
+ UDEV_RULES_DIR = "/etc/udev/rules.d"
+
# see bugzilla #328126
def CopyHardwareUdevRules
- udev_rules_srcdir = "/etc/udev/rules.d/"
- udev_rules_destdir = Builtins.sformat(
- "%1%2",
- Installation.destdir,
- udev_rules_srcdir
- )
+ udev_rules_destdir = File.join(Installation.destdir, UDEV_RULES_DIR)
- if !FileUtils.Exists(udev_rules_destdir)
- Builtins.y2milestone(
- "%1 does not exist yet, creating it",
- udev_rules_destdir
- )
- WFM.Execute(
- path(".local.bash"),
- Builtins.sformat("mkdir -p '%1'", udev_rules_destdir)
- )
+ if ! FileUtils.Exists(udev_rules_destdir)
+ log.info "Directory #{udev_rules_destdir} does not exist yet, creating
it"
+ WFM.Execute(path(".local.bash"), "mkdir -p #{udev_rules_destdir}")
end
- # udev files that should be copied
- # Copy network rules early to get them to initrd, bnc#666079
- files_to_copy = ["70-persistent-cd.rules", "70-persistent-net.rules"]
-
- Builtins.foreach(files_to_copy) do |one_file|
- one_file_from = Builtins.sformat("%1%2", udev_rules_srcdir, one_file)
- one_file_to = Builtins.sformat("%1%2", udev_rules_destdir, one_file)
- if !FileUtils.Exists(one_file_from)
- Builtins.y2milestone("Udev file not generated, so do not copy it:
%1", one_file_from)
- elsif FileUtils.Exists(one_file_to)
- Builtins.y2milestone("File %1 exists, skipping", one_file_to)
- else
- cmd = Builtins.sformat(
- "cp -a '%1' '%2'",
- String.Quote(one_file_from),
- String.Quote(udev_rules_destdir)
- )
- cmd_out = Convert.to_map(WFM.Execute(path(".local.bash_output"),
cmd))
+ # Copy all udev files, but do not overwrite those that already exist
+ # on the system bnc#860089
+ # They are (also) needed for initrd bnc#666079
+ cmd = "cp -avr --no-clobber #{UDEV_RULES_DIR}/. #{udev_rules_destdir}"
+ log.info "Copying all udev rules from #{UDEV_RULES_DIR} to
#{udev_rules_destdir}"
+ cmd_out = WFM.Execute(path(".local.bash_output"), cmd)
- if Ops.get_integer(cmd_out, "exit", -1) != 0
- Builtins.y2error("Command failed '%1': %2", cmd, cmd_out)
- else
- Builtins.y2milestone("Copied to %1", one_file_to)
- end
- end
+ if cmd_out["exit"] != 0
+ log.error "Error copying udev rules"
end
nil
end
- end
+
+ # Prevent from re-defining client class
+ # Re-defining would produce warnings that constants were already initialized
+ end unless defined? CopyFilesFinishClient
end
Yast::CopyFilesFinishClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.29/src/clients/desktop_finish.rb
new/yast2-installation-3.1.39/src/clients/desktop_finish.rb
--- old/yast2-installation-3.1.29/src/clients/desktop_finish.rb 2014-02-03
16:35:05.000000000 +0100
+++ new/yast2-installation-3.1.39/src/clients/desktop_finish.rb 2014-02-21
10:41:10.000000000 +0100
@@ -30,6 +30,9 @@
#
# $Id$
#
+
+require "installation/minimal_installation"
+
module Yast
class DesktopFinishClient < Client
def main
@@ -63,13 +66,14 @@
Builtins.y2debug("param=%1", @param)
if @func == "Info"
+ minimal_inst = ::Installation::MinimalInstallation.instance.enabled?
return {
"steps" => 1,
# progress step title
"title" => _(
"Initializing default window manager..."
),
- "when" => [:installation, :autoinst]
+ "when" => minimal_inst ? [] : [:installation, :autoinst]
}
elsif @func == "Write"
# this detects WM and DM according to selected patterns and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.29/src/clients/inst_finish.rb
new/yast2-installation-3.1.39/src/clients/inst_finish.rb
--- old/yast2-installation-3.1.29/src/clients/inst_finish.rb 2014-02-03
16:35:05.000000000 +0100
+++ new/yast2-installation-3.1.39/src/clients/inst_finish.rb 2014-02-21
10:41:10.000000000 +0100
@@ -161,16 +161,6 @@
"icon" => "yast-desktop-select"
},
{
- "id" => "install_bootloader",
- # progress stage
- "label" => _("Install boot manager"),
- "steps" => [
- "bootloader",
- ProductFeatures.GetBooleanFeature("globals", "enable_kdump") ==
true ? "kdump" : ""
- ],
- "icon" => "yast-bootloader"
- },
- {
"id" => "save_settings",
# progress stage
"label" => _("Save installation settings"),
@@ -188,6 +178,18 @@
],
"icon" => "yast-network"
},
+ # bnc#860089: Save bootloader as late as possible
+ # all different (config) files need to be written and copied first
+ {
+ "id" => "install_bootloader",
+ # progress stage
+ "label" => _("Install boot manager"),
+ "steps" => [
+ "bootloader",
+ ProductFeatures.GetBooleanFeature("globals", "enable_kdump") ==
true ? "kdump" : ""
+ ],
+ "icon" => "yast-bootloader"
+ },
{
"id" => "prepare_for_reboot",
# progress stage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.29/src/clients/inst_system_analysis.rb
new/yast2-installation-3.1.39/src/clients/inst_system_analysis.rb
--- old/yast2-installation-3.1.29/src/clients/inst_system_analysis.rb
2014-02-03 16:35:05.000000000 +0100
+++ new/yast2-installation-3.1.39/src/clients/inst_system_analysis.rb
2014-02-21 10:41:10.000000000 +0100
@@ -56,7 +56,7 @@
Yast.include self, "packager/storage_include.rb"
Yast.include self, "packager/load_release_notes.rb"
- if Mode.autoinst || Mode.autoupgrade
+ if Mode.autoupgrade
Report.Import(
{
"messages" => { "timeout" => 10 },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.29/src/clients/random_finish.rb
new/yast2-installation-3.1.39/src/clients/random_finish.rb
--- old/yast2-installation-3.1.29/src/clients/random_finish.rb 2014-02-03
16:35:05.000000000 +0100
+++ new/yast2-installation-3.1.39/src/clients/random_finish.rb 2014-02-21
10:41:10.000000000 +0100
@@ -26,6 +26,9 @@
# Authors: Lukas Ocilka <[email protected]>
#
# $Id$
+
+require "installation/minimal_installation"
+
module Yast
class RandomFinishClient < Client
def main
@@ -52,13 +55,15 @@
Builtins.y2debug("param=%1", @param)
if @func == "Info"
+ minimal_inst = ::Installation::MinimalInstallation.instance.enabled?
return {
"steps" => 1,
# progress step title
"title" => _(
"Enabling random number generator..."
),
- "when" => [:installation, :live_installation, :update, :autoinst]
+ "when" => minimal_inst ? [] :
+ [:installation, :live_installation, :update, :autoinst]
}
elsif @func == "Write"
@init_path = "/etc/init.d/"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.29/src/clients/release_notes_popup.rb
new/yast2-installation-3.1.39/src/clients/release_notes_popup.rb
--- old/yast2-installation-3.1.29/src/clients/release_notes_popup.rb
2014-02-03 16:35:05.000000000 +0100
+++ new/yast2-installation-3.1.39/src/clients/release_notes_popup.rb
1970-01-01 01:00:00.000000000 +0100
@@ -1,218 +0,0 @@
-# encoding: utf-8
-
-#
------------------------------------------------------------------------------
-# Copyright (c) 2006-2012 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: installation/general/inst_relase_notes.ycp
-# Module: Installation
-# Summary: Display release notes
-# Authors: Arvin Schnell <[email protected]>
-#
-# Display release notes.
-#
-# $Id$
-module Yast
- class ReleaseNotesPopupClient < Client
- def main
- Yast.import "UI"
- Yast.import "Pkg"
- textdomain "installation"
-
- Yast.import "Language"
- Yast.import "Report"
- Yast.import "Label"
- Yast.import "Stage"
- Yast.import "Packages"
- Yast.import "Mode"
-
- # filename of release notes
- @file = ""
-
- # release notes
- @text = ""
-
- Builtins.y2milestone("Calling: Release Notes Popup")
-
- if !(Mode.live_installation ? find_release_notes : load_release_notes)
- # error report
- Report.Error(_("Cannot load release notes."))
- return nil
- end
-
- @text = Ops.add(
- # beginning of the rich text with the release notes
- _(
- "<p><b>These are the release notes for the initial release. They
are\n" +
- "part of the installation media. During installation, if a
connection\n" +
- "to the Internet is available, you can download updated release
notes\n" +
- "from the SUSE Linux Web server.</b></p>\n"
- ),
- @text
- )
-
- # bugzilla #221222, #213239
- @display_info = UI.GetDisplayInfo
- @min_size_x = 76
- @min_size_y = 22
-
- # textmode
- if Ops.get_boolean(@display_info, "TextMode", true)
- @min_size_x = Ops.divide(
- Ops.multiply(
- Builtins.tointeger(Ops.get_integer(@display_info, "Width", 80)),
- 3
- ),
- 4
- )
- @min_size_y = Ops.divide(
- Ops.multiply(
- Builtins.tointeger(Ops.get_integer(@display_info, "Height", 25)),
- 2
- ),
- 3
- )
- @min_size_x = 76 if Ops.less_than(@min_size_x, 76)
- @min_size_y = 22 if Ops.less_than(@min_size_y, 22)
- Builtins.y2milestone(
- "X/x Y/y %1/%2 %3/%4",
- Ops.get_integer(@display_info, "Width", 80),
- @min_size_x,
- Ops.get_integer(@display_info, "Height", 25),
- @min_size_y
- )
- # GUI
- else
- @min_size_x = 100
- @min_size_y = 30
- end
-
- @contents = MinSize(
- @min_size_x,
- @min_size_y,
- VBox(
- VSpacing(0.5),
- Left(Heading(_("Release Notes"))),
- RichText(Id(:text), @text),
- VSpacing(0.5),
- ButtonBox(
- PushButton(Id(:close), Opt(:okButton, :key_F9), Label.CloseButton)
- ),
- VSpacing(0.5)
- )
- )
-
- UI.OpenDialog(@contents)
- @contents = nil
- UI.SetFocus(:close)
-
- # FIXME: richtext eats return key, but only in NCurses and we want to
- # make users read release notes (and make PgDn work). For Next, F10 is
- # availbale
- UI.SetFocus(Id(:text))
-
- @ret = nil
- begin
- @ret = UI.UserInput
- end until @ret == :close || @ret == :back
- UI.CloseDialog
-
- Builtins.y2milestone("Finishing: Release Notes Popup")
-
- deep_copy(@ret)
- end
-
- # FIXME similar function in packager/include/load_release_notes.ycp
-
- # function to load release notes
- def load_release_notes
- path_to_relnotes = "/docu"
- source_id = 0
- if Stage.initial
- source_id = Ops.get(Packages.theSources, 0, 0)
- else
- sources = Pkg.SourceStartCache(true)
- source_id = Ops.get(sources, 0, 0)
- end
- path_templ = Ops.add(path_to_relnotes, "/RELEASE-NOTES.%1.rtf")
- Builtins.y2debug("Path template: %1", path_templ)
- tmp = Builtins.sformat(path_templ, Language.language)
- Builtins.y2debug("Trying to get %1", tmp)
- tmp = Pkg.SourceProvideDigestedFile(source_id, 1, tmp, false)
- if tmp == nil
- tmp = Builtins.sformat(
- path_templ,
- Ops.get(Builtins.splitstring(Language.language, "_"), 0, "")
- )
- Builtins.y2debug("Trying to get %1", tmp)
- tmp = Pkg.SourceProvideDigestedFile(source_id, 1, tmp, false)
- end
- if tmp == nil
- tmp = Builtins.sformat(path_templ, "en")
- Builtins.y2debug("Trying to get %1", tmp)
- tmp = Pkg.SourceProvideDigestedFile(source_id, 1, tmp, false)
- end
- return false if tmp == nil
-
- @text = Convert.to_string(SCR.Read(path(".target.string"), [tmp, ""]))
- return true if @text != "" && @text != nil
- false
- end
-
- # in live installation, the release notes are in the /usr/doc directory,
find right file there (bug 332862)
- def find_release_notes
- Builtins.y2milestone("Finding release notes in local filesystem")
- # FIXME hardcoded product name
- path_to_relnotes = "/usr/share/doc/release-notes/openSUSE/"
- path_templ = Ops.add(path_to_relnotes, "/RELEASE-NOTES.%1.rtf")
- Builtins.y2debug("Path template: %1", path_templ)
- tmp = Builtins.sformat(path_templ, Language.language)
- Builtins.y2debug("Trying to get %1", tmp)
- if Ops.greater_or_equal(
- 0,
- Convert.to_integer(SCR.Read(path(".target.size"), tmp))
- )
- tmp = Builtins.sformat(
- path_templ,
- Ops.get(Builtins.splitstring(Language.language, "_"), 0, "")
- )
- Builtins.y2debug("Trying to get %1", tmp)
- end
- if Ops.greater_or_equal(
- 0,
- Convert.to_integer(SCR.Read(path(".target.size"), tmp))
- )
- tmp = Builtins.sformat(path_templ, "en")
- Builtins.y2debug("Trying to get %1", tmp)
- end
- if Ops.greater_or_equal(
- 0,
- Convert.to_integer(SCR.Read(path(".target.size"), tmp))
- )
- return false
- end
-
- Builtins.y2milestone("Reading file %1", tmp)
- @text = Convert.to_string(SCR.Read(path(".target.string"), [tmp, ""]))
- return true if @text != "" && @text != nil
- false
- end
- end
-end
-
-Yast::ReleaseNotesPopupClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.29/src/clients/save_config_finish.rb
new/yast2-installation-3.1.39/src/clients/save_config_finish.rb
--- old/yast2-installation-3.1.29/src/clients/save_config_finish.rb
2014-02-03 16:35:05.000000000 +0100
+++ new/yast2-installation-3.1.39/src/clients/save_config_finish.rb
2014-02-21 10:41:10.000000000 +0100
@@ -30,6 +30,9 @@
#
# $Id$
#
+
+require "installation/minimal_installation"
+
module Yast
class SaveConfigFinishClient < Client
def main
@@ -72,9 +75,20 @@
Builtins.y2debug("func=%1", @func)
Builtins.y2debug("param=%1", @param)
+ minimal_inst = ::Installation::MinimalInstallation.instance.enabled?
+
if @func == "Info"
+ if Mode.autoinst
+ steps = minimal_inst ? 3 : 7
+ elsif Mode.update
+ steps = minimal_inst ? 2 : 5
+ elsif Mode.installation
+ steps = minimal_inst ? 2 : 6
+ else
+ raise "Unknown mode"
+ end
return {
- "steps" => Mode.autoinst ? 7 : Mode.update ? 5 : 6,
+ "steps" => steps,
"when" => [:installation, :update, :autoinst]
}
elsif @func == "Write"
@@ -115,7 +129,7 @@
end
end
- if !Mode.update
+ if !Mode.update && !minimal_inst
# progress step title
Progress.Title(_("Saving time zone..."))
# clock must be set correctly in new chroot
@@ -124,7 +138,7 @@
end
Progress.NextStep
- if !Mode.update
+ if !Mode.update && !minimal_inst
# progress step title
Progress.Title(_("Saving language..."))
Language.Save
@@ -134,7 +148,7 @@
Progress.Title(_("Saving console configuration..."))
Console.Save
Progress.NextStep
- else
+ elsif Mode.update
@lang = Language.language
@file = Ops.add(Directory.vardir, "/language.ycp")
Builtins.y2milestone(
@@ -148,10 +162,12 @@
{ "second_stage_language" => @lang }
)
end
- # progress step title
- Progress.Title(_("Saving keyboard configuration..."))
- Keyboard.Save
- Progress.NextStep
+ if !minimal_inst
+ # progress step title
+ Progress.Title(_("Saving keyboard configuration..."))
+ Keyboard.Save
+ Progress.NextStep
+ end
# progress step title
Progress.Title(_("Saving product information..."))
ProductFeatures.Save
@@ -163,25 +179,27 @@
end
Progress.NextStep
# progress step title
- Progress.Title(_("Saving security settings..."))
- SCR.Write(
- path(".sysconfig.security.CHECK_SIGNATURES"),
- SignatureCheckDialogs.CheckSignatures
- )
- SCR.Write(path(".sysconfig.security"), nil)
+ if !minimal_inst
+ Progress.Title(_("Saving security settings..."))
+ SCR.Write(
+ path(".sysconfig.security.CHECK_SIGNATURES"),
+ SignatureCheckDialogs.CheckSignatures
+ )
+ SCR.Write(path(".sysconfig.security"), nil)
- Progress.NextStep
- # progress step title
- Progress.Title(_("Saving boot scripts settings..."))
- @run_in_parallel = ProductFeatures.GetBooleanFeature(
- "globals",
- "run_init_scripts_in_parallel"
- )
- SCR.Write(
- path(".sysconfig.boot.RUN_PARALLEL"),
- @run_in_parallel ? "yes" : "no"
- )
- SCR.Write(path(".sysconfig.boot"), nil)
+ Progress.NextStep
+ # progress step title
+ Progress.Title(_("Saving boot scripts settings..."))
+ @run_in_parallel = ProductFeatures.GetBooleanFeature(
+ "globals",
+ "run_init_scripts_in_parallel"
+ )
+ SCR.Write(
+ path(".sysconfig.boot.RUN_PARALLEL"),
+ @run_in_parallel ? "yes" : "no"
+ )
+ SCR.Write(path(".sysconfig.boot"), nil)
+ end
# save supportconfig
if Ops.greater_than(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.29/src/clients/save_hw_status_finish.rb
new/yast2-installation-3.1.39/src/clients/save_hw_status_finish.rb
--- old/yast2-installation-3.1.29/src/clients/save_hw_status_finish.rb
2014-02-03 16:35:05.000000000 +0100
+++ new/yast2-installation-3.1.39/src/clients/save_hw_status_finish.rb
2014-02-21 10:41:10.000000000 +0100
@@ -30,6 +30,9 @@
#
# $Id$
#
+
+require "installation/minimal_installation"
+
module Yast
class SaveHwStatusFinishClient < Client
def main
@@ -60,11 +63,12 @@
Builtins.y2debug("param=%1", @param)
if @func == "Info"
+ minimal_inst = ::Installation::MinimalInstallation.instance.enabled?
return {
"steps" => 1,
# progress step title
"title" => _("Saving hardware configuration..."),
- "when" => [:installation, :update, :autoinst]
+ "when" => minimal_inst ? [] : [:installation, :update, :autoinst]
}
elsif @func == "Write"
# Package yast2-printer needs to be installed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.29/src/lib/installation/minimal_installation.rb
new/yast2-installation-3.1.39/src/lib/installation/minimal_installation.rb
--- old/yast2-installation-3.1.29/src/lib/installation/minimal_installation.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.39/src/lib/installation/minimal_installation.rb
2014-02-21 10:41:10.000000000 +0100
@@ -0,0 +1,35 @@
+require "singleton"
+require "yast"
+
+
+module Installation
+ # Wrapper around minimal installation configuration.
+ #
+ # Now supported only in autoyast
+ class MinimalInstallation
+ include Singleton
+ include Yast::Logger
+
+ def enabled
+ return @enabled unless @enabled.nil?
+
+ Yast.import "Mode"
+ if Yast::Mode.autoinst
+ Yast.import "Profile"
+ profile = Yast::Profile.current
+ if profile["general"]["minimal-configuration"]
+ @enabled = true
+ else
+ @enabled = false
+ end
+ else
+ @enabled = false
+ end
+
+ log.info "Minimal installation enabled?: #{@enabled}"
+
+ @enabled
+ end
+ alias_method :enabled?, :enabled
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.29/startup/Second-Stage/S07-medium
new/yast2-installation-3.1.39/startup/Second-Stage/S07-medium
--- old/yast2-installation-3.1.29/startup/Second-Stage/S07-medium
2014-02-03 16:35:06.000000000 +0100
+++ new/yast2-installation-3.1.39/startup/Second-Stage/S07-medium
2014-02-21 10:41:10.000000000 +0100
@@ -24,7 +24,7 @@
#---------------------------------------------
if [ ! -z "$(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo')" ]; then
log "\tnetwork configuration found -> activate network"
- rcnetwork start -o onboot && Y2_NETWORK_ACTIVE=1
+ rcnetwork start && Y2_NETWORK_ACTIVE=1
[ -f /var/lib/YaST2/network_install_rpcbind ] && rcrpcbind start
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.29/startup/YaST2.call
new/yast2-installation-3.1.39/startup/YaST2.call
--- old/yast2-installation-3.1.29/startup/YaST2.call 2014-02-03
16:35:06.000000000 +0100
+++ new/yast2-installation-3.1.39/startup/YaST2.call 2014-02-21
10:41:10.000000000 +0100
@@ -440,7 +440,7 @@
# 3) Medium prequalification
#---------------------------------------------
# Check which installation mediums can be used. There are
-# four mediums available: Qt(0) SSH(1), VNC(2), NCURSES(3) and Gtk(4).
+# five mediums available: Qt(0) SSH(1), VNC(2), NCURSES(3) and Gtk(4).
# The following checks will create an array which contains
# the possible mediums. An index of 1 indicates "can be used"
# an index of 0 indicated "cannot be used"
@@ -507,7 +507,7 @@
# 3.2) prequalification checks for SSH
#---------------------------------------------
# 3.2.1) Check for SSH daemon
-if ! /usr/sbin/rcsshd status > /dev/null 2>&1 ; then
+if ! pidof sshd > /dev/null 2>&1 ; then
log "\tNo SSH daemon running -> Medium SSH disabled"
MEDIUM[1]=0
fi
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
