Hello community,
here is the log from the commit of package yast2-installation
checked in at Wed Apr 23 00:39:39 CEST 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-04-17 14:02:47.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2008-04-22 17:18:10.000000000 +0200
@@ -1,0 +2,36 @@
+Tue Apr 22 12:26:52 CEST 2008 - locilka@suse.cz
+
+- Fixed filtering-out already registered repos (bnc #379051).
+- Client inst_prepare_image moved to installation proposal make
+ disabling 'installation from images' easy (bnc #381234).
+- 2.16.38
+
+-------------------------------------------------------------------
+Mon Apr 21 15:28:24 CEST 2008 - locilka@suse.cz
+
+- Calling 'xset r off' & 'xset m 1' (bnc #376945).
+- Better help for Automatic configuration (bnc #381904).
+
+-------------------------------------------------------------------
+Mon Apr 21 14:48:58 CEST 2008 - locilka@suse.cz
+
+- Using new DefaultDesktop::SelectedDesktops for writing the
+ display manager configuration.
+
+-------------------------------------------------------------------
+Fri Apr 18 16:17:54 CEST 2008 - locilka@suse.cz
+
+- Calling 'xset -r off' at the beginning of installation (both
+ first and second stage) in X on XEN (bnc #376945).
+
+-------------------------------------------------------------------
+Fri Apr 18 16:01:13 CEST 2008 - juhliarik@suse.cz
+
+- Added text for using kexec (yast_inf_finish.ycp)
+
+-------------------------------------------------------------------
+Thu Apr 17 17:15:02 CEST 2008 - locilka@suse.cz
+
+- Added more debugging messages into ImageInstallation module.
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.16.37.tar.bz2
New:
----
yast2-installation-2.16.38.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.M20218/_old 2008-04-23 00:32:59.000000000 +0200
+++ /var/tmp/diff_new_pack.M20218/_new 2008-04-23 00:32:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.16.37)
+# spec file for package yast2-installation (Version 2.16.38)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-installation
-Version: 2.16.37
+Version: 2.16.38
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.37.tar.bz2
+Source0: yast2-installation-2.16.38.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# PackageCallbacks::RegisterEmptyProgressCallbacks()
@@ -33,8 +33,8 @@
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
Requires: yast2-country-data >= 2.16.11
-# SourceManager::InstInitSourceMoveDownloadArea
-Requires: yast2-packager >= 2.16.32
+# DefaultDesktop::SelectedDesktops
+Requires: yast2-packager >= 2.16.37
# Only in inst-sys
# Requires: yast2-runlevel
# Requires: yast2-network
@@ -106,7 +106,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.16.37
+%setup -n yast2-installation-2.16.38
%build
%{prefix}/bin/y2tool y2autoconf
@@ -172,6 +172,24 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Tue Apr 22 2008 locilka@suse.cz
+- Fixed filtering-out already registered repos (bnc #379051).
+- Client inst_prepare_image moved to installation proposal make
+ disabling 'installation from images' easy (bnc #381234).
+- 2.16.38
+* Mon Apr 21 2008 locilka@suse.cz
+- Calling 'xset r off' & 'xset m 1' (bnc #376945).
+- Better help for Automatic configuration (bnc #381904).
+* Mon Apr 21 2008 locilka@suse.cz
+- Using new DefaultDesktop::SelectedDesktops for writing the
+ display manager configuration.
+* Fri Apr 18 2008 locilka@suse.cz
+- Calling 'xset -r off' at the beginning of installation (both
+ first and second stage) in X on XEN (bnc #376945).
+* Fri Apr 18 2008 juhliarik@suse.cz
+- Added text for using kexec (yast_inf_finish.ycp)
+* Thu Apr 17 2008 locilka@suse.cz
+- Added more debugging messages into ImageInstallation module.
* Thu Apr 17 2008 locilka@suse.cz
- Added image-downloading progress (reusing existent progress bar).
- 2.16.37
++++++ yast2-installation-2.16.37.tar.bz2 -> yast2-installation-2.16.38.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.37/configure new/yast2-installation-2.16.38/configure
--- old/yast2-installation-2.16.37/configure 2008-04-17 14:03:28.000000000 +0200
+++ new/yast2-installation-2.16.38/configure 2008-04-22 17:18:30.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-installation 2.16.37.
+# Generated by GNU Autoconf 2.61 for yast2-installation 2.16.38.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.16.37'
-PACKAGE_STRING='yast2-installation 2.16.37'
+PACKAGE_VERSION='2.16.38'
+PACKAGE_STRING='yast2-installation 2.16.38'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1208,7 +1208,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-installation 2.16.37 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.16.38 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1279,7 +1279,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.16.37:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.16.38:";;
esac
cat <<\_ACEOF
@@ -1357,7 +1357,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.16.37
+yast2-installation configure 2.16.38
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1371,7 +1371,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-installation $as_me 2.16.37, which was
+It was created by yast2-installation $as_me 2.16.38, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2192,7 +2192,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.16.37'
+ VERSION='2.16.38'
cat >>confdefs.h <<_ACEOF
@@ -2420,7 +2420,7 @@
-VERSION="2.16.37"
+VERSION="2.16.38"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -3557,7 +3557,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-installation $as_me 2.16.37, which was
+This file was extended by yast2-installation $as_me 2.16.38, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3600,7 +3600,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-installation config.status 2.16.37
+yast2-installation config.status 2.16.38
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.37/configure.in new/yast2-installation-2.16.38/configure.in
--- old/yast2-installation-2.16.37/configure.in 2008-04-17 14:03:18.000000000 +0200
+++ new/yast2-installation-2.16.38/configure.in 2008-04-22 17:18:24.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.16.37, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.16.38, http://bugs.opensuse.org/, yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.37"
+VERSION="2.16.38"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.37/src/clients/automatic_configuration_finish.ycp new/yast2-installation-2.16.38/src/clients/automatic_configuration_finish.ycp
--- old/yast2-installation-2.16.37/src/clients/automatic_configuration_finish.ycp 2008-04-17 11:08:36.000000000 +0200
+++ new/yast2-installation-2.16.38/src/clients/automatic_configuration_finish.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,105 +0,0 @@
-/**
- * File: clients/automatic_configuration_finish.ycp
- * Package: installation
- * Summary: Automatic configuration instead of the second stage.
- * DO NOT USE THIS CLIENT ANYMORE.
- * Authors: Lukas Ocilka
- * ThanksTo: Martin Vidner
- * Ladislav Slezak
- *
- * $Id:$
- *
- * @see http://visnov.blogspot.com/2008/02/getting-rid-of-2nd-stage-of.html
- */
-
-{
- import "Report";
- import "FileUtils";
- import "Installation";
- import "ProductControl";
- import "GetInstArgs";
-
- textdomain "installation";
-
- y2error ("DO NOT USE THIS CLIENT ANYMORE!");
- return nil;
-
- any ret = nil;
- string func = "";
- map param = $[];
-
- /* Check arguments */
- if(size(WFM::Args()) > 0 && is (WFM::Args (0), string)) {
- func = (string) WFM::Args (0);
- if (size (WFM::Args()) > 1 && is (WFM::Args (1), map))
- param = (map) WFM::Args (1);
- }
- y2milestone ("starting automatic_configuration_finish");
- y2debug("func=%1", func);
- y2debug("param=%1", param);
-
- // functions -->
-
- string zypp_lock_file = "/var/run/zypp.pid";
-
- void RemoveZyppLockIfExists () {
- // a bit cruel, remove the zypp log if exists
- if (FileUtils::Exists (zypp_lock_file)) {
- y2milestone ("Removing zypp lock %1", zypp_lock_file);
- SCR::Execute (.target.remove, zypp_lock_file);
- }
- }
-
- void Write () {
- // Just to be sure...
- Pkg::SourceFinishAll();
- Pkg::TargetFinish();
-
- RemoveZyppLockIfExists();
- // FIXME: should be done somehow else and somewhere else...?
- if (! FileUtils::Exists ("/mnt/etc/install.inf")) {
- y2milestone ("Copying install.inf");
- WFM::Execute (.local.bash, "cp /etc/install.inf /mnt/etc/install.inf");
- }
-
- y2milestone ("~~~ MAGIC! -----------------------------------------------------------------");
-
- integer old_SCR = WFM::SCRGetDefault();
- integer new_SCR = WFM::SCROpen ("chroot="+Installation::destdir+":scr", false);
- WFM::SCRSetDefault (new_SCR);
-
- RemoveZyppLockIfExists();
- y2milestone ("Running autoconf - a separate YaST process");
- // FIXME: solve Y2DEBUG somehow
- string cmd = "/usr/lib/YaST2/bin/y2base /usr/share/YaST2/clients/inst_automatic_configuration.ycp UI";
- // FIXME: use process agent
- // and use lome logging to file and `tail -F` from here
- map cmd_ret = (map) SCR::Execute (.target.bash_output, cmd);
- y2milestone ("Command '%1' returned %2", cmd, cmd_ret);
-
- WFM::SCRClose (new_SCR);
- WFM::SCRSetDefault (old_SCR);
-
- y2milestone ("~~~ MAGIC! -----------------------------------------------------------------");
- }
-
- // <-- functions
-
- // main()
- if (func == "Info") {
- ret = (any) $[
- "steps" : 1,
- // progress step title
- "title" : _("Writing automatic configuration..."),
- // only when requested
- "when" : (ProductControl::GetUseAutomaticConfiguration() == true ? [ `installation ] : []),
- ];
- } else if (func == "Write") {
- Write();
- } else {
- y2error ("unknown function: %1", func);
- ret = nil;
- }
-
- return ret;
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.37/src/clients/deploying_proposal.ycp new/yast2-installation-2.16.38/src/clients/deploying_proposal.ycp
--- old/yast2-installation-2.16.37/src/clients/deploying_proposal.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.16.38/src/clients/deploying_proposal.ycp 2008-04-22 16:45:10.000000000 +0200
@@ -0,0 +1,137 @@
+/**
+ * Module: deploying_proposal.ycp
+ *
+ * Authors: Lukas Ocilka
+ *
+ * Purpose: Proposal function dispatcher - deploying images
+ *
+ * See also file proposal-API.txt for details.
+ * $Id$
+ */
+{
+ textdomain "installation";
+
+ import "Mode";
+ import "ImageInstallation";
+ import "Progress";
+ import "Installation";
+ import "Report";
+
+ string func = (string) WFM::Args(0);
+ map param = (map) WFM::Args(1);
+ map ret = $[];
+
+ string im_do_enable = "deploying_enable";
+ string im_do_disable = "deploying_disable";
+
+ string GenerateProposalText () {
+ map im_conf = ImageInstallation::ImagesToUse();
+
+ string ret = "<ul>\n";
+
+ if (im_conf["deploying_enabled"]:false == true) {
+ ret = ret + "<li>" + sformat (
+ // TRANSLATORS: Installation overview
+ // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
+ _("Installation from images is enabled (disable</a>)"),
+ im_do_disable
+ ) + "</li>";
+ } else {
+ ret = ret + "<li>" + sformat (
+ // TRANSLATORS: Installation overview
+ // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
+ _("Installation from images is disabled (enable</a>)"),
+ im_do_enable
+ ) + "</li>";
+ }
+
+ ret = ret + "</ul>\n";
+
+ return ret;
+ }
+
+ void CallProposalScript () {
+ boolean progress_orig = Progress::set (false);
+ WFM::CallFunction ("inst_prepare_image", []);
+ Progress::set (progress_orig);
+ }
+
+ if (func == "MakeProposal") {
+ boolean force_reset = param["force_reset"]:false;
+ boolean language_changed = param["language_changed"]:false;
+
+ if (force_reset) {
+ ImageInstallation::last_patterns_selected = [ nil ];
+ ImageInstallation::changed_by_user = false;
+ }
+
+ if (ImageInstallation::changed_by_user == true && Installation::image_installation == false) {
+ y2milestone ("ImageInstallation already disabled by user");
+ } else {
+ CallProposalScript();
+ }
+
+ if (Mode::installation()) {
+ y2error ("FIXME: HELP!");
+ ret = $[
+ "preformatted_proposal" : GenerateProposalText(),
+ "links" : [ im_do_enable, im_do_disable ],
+ // TRANSLATORS: help text
+ "help" : _("<p><b>Installation from Images</b> is used to speed the installation up.
+Images contain compressed snapshots of installed system matching your selection
+of patterns. The rest of packages which are not in images will be installed from
+packages the standard way.</p>") +
+ // TRANSLATORS: help text
+ _("<p>Installation from images is disabled by default if the current
+pattern selection does not fit any set of images.</p>"),
+ ];
+ } else {
+ y2error ("Installation from images should be used for new installation only!");
+ ret = $[
+ "preformatted_proposal" : sformat (_("Error: Images should not be used for mode: %1"), Mode::mode()),
+ "warning_level" : `error,
+ ];
+ }
+ }
+
+ else if (func == "AskUser") {
+ any chosen_id = param["chosen_id"]:nil;
+ y2milestone("Images proposal change requested, id %1", chosen_id);
+
+ boolean old_status = Installation::image_installation;
+
+ if (chosen_id == im_do_disable) {
+ Installation::image_installation = false;
+ } else if (chosen_id == im_do_enable) {
+ Installation::image_installation = true;
+ } else {
+ Installation::image_installation = (! Installation::image_installation);
+ }
+
+ // changed to true
+ if (Installation::image_installation)
+ CallProposalScript();
+
+ if (old_status == false && old_status == Installation::image_installation) {
+ Report::Message (_("Unable to enable installation from images.
+
+Currently selected patterns do not fit the images
+stored on installation media."));
+ }
+
+ ImageInstallation::changed_by_user = true;
+ ret = $[ "workflow_sequence" : `next ];
+ }
+
+ else if ( func == "Description" ) {
+ ret = $[
+ // this is a heading
+ "rich_text_title" : _("Installation from Images"),
+ // this is a menu entry
+ "menu_title" : _("Installation from &Images"),
+ "id" : "deploying"
+ ];
+ }
+
+ return ret;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.37/src/clients/desktop_finish.ycp new/yast2-installation-2.16.38/src/clients/desktop_finish.ycp
--- old/yast2-installation-2.16.37/src/clients/desktop_finish.ycp 2008-04-17 11:08:36.000000000 +0200
+++ new/yast2-installation-2.16.38/src/clients/desktop_finish.ycp 2008-04-21 14:49:57.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: desktop_finish.ycp 45893 2008-03-31 14:45:52Z locilka $
+ * $Id: desktop_finish.ycp 46904 2008-04-21 12:47:29Z locilka $
*
*/
@@ -76,7 +76,13 @@
"cursor" : "DMZ",
],
"kde" : $[
- "package" : ["kde4-kdm", "kdebase3-kdm"],
+ "package" : ["kde4-kdm"],
+ "wm" : "kde",
+ "dm" : "kdm",
+ "cursor" : "DMZ",
+ ],
+ "kde3" : $[
+ "package" : ["kdebase3-kdm"],
"wm" : "kde",
"dm" : "kdm",
"cursor" : "DMZ",
@@ -95,44 +101,9 @@
string selected_desktop = DefaultDesktop::Desktop ();
- // DefaultDesktop has been set
- if (selected_desktop != "" && selected_desktop != nil) {
- y2milestone ("Desktop was set to %1", selected_desktop);
- default_wm = desktop_data[selected_desktop, "wm"]:"";
- default_dm = desktop_data[selected_desktop, "dm"]:"";
- default_cursor = desktop_data[selected_desktop, "cursor"]:"";
-
- // KDE, GNOME CD ... or desktop just not set at all
- } else {
- list