Hello community,
here is the log from the commit of package yast2-installation
checked in at Mon Jan 28 16:03:20 CET 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-01-24 16:14:35.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2008-01-28 15:24:09.387236000 +0100
@@ -1,0 +2,12 @@
+Mon Jan 28 13:00:19 CET 2008 - aschnell@suse.de
+
+- support Qt and Gtk frontend in startup scripts
+- hack for key-autorepeat during installation (bnc #346186)
+- 2.16.11
+
+-------------------------------------------------------------------
+Fri Jan 25 13:35:13 CET 2008 - locilka@suse.cz
+
+- Reduced Wizard redrawing in the installation workflow.
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.16.10.tar.bz2
New:
----
yast2-installation-2.16.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.pm8130/_old 2008-01-28 16:03:04.000000000 +0100
+++ /var/tmp/diff_new_pack.pm8130/_new 2008-01-28 16:03:04.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.16.10)
+# spec file for package yast2-installation (Version 2.16.11)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.16.10
+Version: 2.16.11
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.10.tar.bz2
+Source0: yast2-installation-2.16.11.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
# Mode::live_installation
@@ -70,12 +70,12 @@
Summary: YaST2 - Installation Parts
%package devel-doc
-Version: 2.16.10
+Version: 2.16.11
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.10.tar.bz2
+Source0: yast2-installation-2.16.11.tar.bz2
Prefix: /usr
Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq
@@ -108,7 +108,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.16.10
+%setup -n yast2-installation-2.16.11
%build
%{prefix}/bin/y2tool y2autoconf
@@ -178,6 +178,12 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Mon Jan 28 2008 aschnell@suse.de
+- support Qt and Gtk frontend in startup scripts
+- hack for key-autorepeat during installation (bnc #346186)
+- 2.16.11
+* Fri Jan 25 2008 locilka@suse.cz
+- Reduced Wizard redrawing in the installation workflow.
* Thu Jan 24 2008 aschnell@suse.de
- start service brld before suse-blinux (bug #354769)
- 2.16.10
@@ -1395,7 +1401,7 @@
* Mon Apr 24 2006 lnussel@suse.de
- run rcSuSEfirewall2 reload when installing via vnc or ssh (#153467)
- 2.13.85
-* Fri Apr 21 2006 jsrain@suse.de
+* Sat Apr 22 2006 jsrain@suse.de
- determine base product accordign to flag (#160585)
- 2.13.84
* Fri Apr 21 2006 jdsn@suse.de
@@ -1488,7 +1494,7 @@
* Mon Apr 10 2006 mvidner@suse.cz
- Add installation sources for online update (#163192).
- 2.13.63
-* Fri Apr 07 2006 jsrain@suse.de
+* Sat Apr 08 2006 jsrain@suse.de
- provide Product::short_name (#163702)
- 2.13.62
* Fri Apr 07 2006 jdsn@suse.de
@@ -1559,7 +1565,7 @@
- icon for product registration (#160293)
- fixes for inst_suse_register
- 2.13.50
-* Mon Mar 27 2006 jsrain@suse.de
+* Tue Mar 28 2006 jsrain@suse.de
- removed desktop selection from NLD workflow (#160650)
* Fri Mar 24 2006 locilka@suse.cz
- Filling up list of release_notes urls for all installed products
@@ -1626,11 +1632,11 @@
- fixed .desktop file for Add-On Products, now it starts add-on
instead of sw_single when launched from YaST Control Center
(#158869).
-* Thu Mar 16 2006 jsrain@suse.de
+* Fri Mar 17 2006 jsrain@suse.de
- added zFCP and DASD modules to list of modules to be cloned after
SLES installation (#153378)
- 2.13.38
-* Thu Mar 16 2006 jsrain@suse.de
+* Fri Mar 17 2006 jsrain@suse.de
- fixed product handling (&product; macro) (#151050)
- allow multiple installation sources (#151755)
* Thu Mar 16 2006 jdsn@suse.de
@@ -1693,13 +1699,13 @@
- fixed back button behavior in installation mode dialog (#155044)
* Mon Mar 06 2006 visnov@suse.cz
- enable media callbacks in the add-on product handling
-* Fri Mar 03 2006 jsrain@suse.de
+* Sat Mar 04 2006 jsrain@suse.de
- added .desktop file for add-on product installation (#154930)
- properly initialize source for add-on product (#154980)
- 2.13.27
* Fri Mar 03 2006 visnov@suse.cz
- reset package manager before installing patches
-* Wed Mar 01 2006 jsrain@suse.de
+* Thu Mar 02 2006 jsrain@suse.de
- release all medias before registering add-on product CD or DVD
(#154348)
- check whether files are on the add-on product media before using
@@ -1716,7 +1722,7 @@
* Thu Feb 23 2006 jsrain@suse.de
- changed the name of the add-on product control file (#152770)
- 2.13.23
-* Wed Feb 22 2006 jsrain@suse.de
+* Thu Feb 23 2006 jsrain@suse.de
- using correct icon (#151630)
- 2.13.22
* Wed Feb 22 2006 ms@suse.de
@@ -1731,17 +1737,17 @@
* Sun Feb 19 2006 jsrain@suse.de
- made inst_proposal more resistent to incorrect data returned from
client modules (#148271)
-* Fri Feb 17 2006 jsrain@suse.de
+* Sat Feb 18 2006 jsrain@suse.de
- removed dependency on yast2-online-update
- integrated add-on product selection to installation workflow
- 2.13.19
* Fri Feb 17 2006 mvidner@suse.cz
- inst_release_notes: Let the combo box have a label.
- inst_disks_activate: fixed the textdomain (s390 -> installation)
-* Thu Feb 16 2006 jsrain@suse.de
+* Fri Feb 17 2006 jsrain@suse.de
- several fixes of add-on product installation
- 2.13.18
-* Tue Feb 14 2006 jsrain@suse.de
+* Wed Feb 15 2006 jsrain@suse.de
- added possibility to use standalone-installation proposals when
installing with base product
- added support for replacing 2nd stage workflow
@@ -3109,7 +3115,7 @@
* Wed Aug 28 2002 kkaempf@suse.de
- trigger cache copying at end
- 2.6.35
-* Tue Aug 27 2002 kkaempf@suse.de
+* Wed Aug 28 2002 kkaempf@suse.de
- init packagemanager properly
- drop all references to old data (suse/setup/descr/info)
* Tue Aug 27 2002 arvin@suse.de
++++++ yast2-installation-2.16.10.tar.bz2 -> yast2-installation-2.16.11.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/configure new/yast2-installation-2.16.11/configure
--- old/yast2-installation-2.16.10/configure 2008-01-24 16:04:23.000000000 +0100
+++ new/yast2-installation-2.16.11/configure 2008-01-28 15:21:05.000000000 +0100
@@ -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.10.
+# Generated by GNU Autoconf 2.61 for yast2-installation 2.16.11.
#
# 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.10'
-PACKAGE_STRING='yast2-installation 2.16.10'
+PACKAGE_VERSION='2.16.11'
+PACKAGE_STRING='yast2-installation 2.16.11'
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.10 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.16.11 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.10:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.16.11:";;
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.10
+yast2-installation configure 2.16.11
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.10, which was
+It was created by yast2-installation $as_me 2.16.11, 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.10'
+ VERSION='2.16.11'
cat >>confdefs.h <<_ACEOF
@@ -2420,7 +2420,7 @@
-VERSION="2.16.10"
+VERSION="2.16.11"
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.10, which was
+This file was extended by yast2-installation $as_me 2.16.11, 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.10
+yast2-installation config.status 2.16.11
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.10/configure.in new/yast2-installation-2.16.11/configure.in
--- old/yast2-installation-2.16.10/configure.in 2008-01-24 16:04:19.000000000 +0100
+++ new/yast2-installation-2.16.11/configure.in 2008-01-28 15:21:01.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.16.10, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.16.11, 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.10"
+VERSION="2.16.11"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/src/clients/installation.ycp new/yast2-installation-2.16.11/src/clients/installation.ycp
--- old/yast2-installation-2.16.10/src/clients/installation.ycp 2007-10-05 17:06:32.000000000 +0200
+++ new/yast2-installation-2.16.11/src/clients/installation.ycp 2008-01-28 12:55:30.000000000 +0100
@@ -18,7 +18,7 @@
import "Report";
// Initialize the UI
- Wizard::CreateDialog ();
+ Wizard::OpenNextBackStepsDialog();
Wizard::SetContents (
// title
"",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.16.11/src/clients/inst_complex_welcome.ycp
--- old/yast2-installation-2.16.10/src/clients/inst_complex_welcome.ycp 2008-01-21 15:43:53.000000000 +0100
+++ new/yast2-installation-2.16.11/src/clients/inst_complex_welcome.ycp 2008-01-28 14:38:45.000000000 +0100
@@ -286,6 +286,7 @@
Wizard::SetContents (heading_text, contents, help_text,
argmap["enable_back"]:true , argmap["enable_next"]:true);
+ Wizard::EnableAbortButton ();
UI::ChangeWidget (`id (`language), `Value, language);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/src/clients/inst_worker_continue.ycp new/yast2-installation-2.16.11/src/clients/inst_worker_continue.ycp
--- old/yast2-installation-2.16.10/src/clients/inst_worker_continue.ycp 2007-10-05 17:06:31.000000000 +0200
+++ new/yast2-installation-2.16.11/src/clients/inst_worker_continue.ycp 2008-01-28 12:55:30.000000000 +0100
@@ -52,7 +52,9 @@
SetSecondStageInstallation();
// All stages
- CreateUI();
+ SetUIContent();
+
+ SetDiskActivationModule();
UpdateWizardSteps ();
@@ -71,8 +73,6 @@
// Shows fallback message if running in textmode (if used as fallback)
ShowTextFallbackMessage();
- SetDiskActivationModule();
-
ret = nil;
/* --- Runing the installation workflow --- */
@@ -147,8 +147,5 @@
// All Sources and Target need to be released...
FinishInstallation (ret);
- // Created UI needs to be destroyed
- UI::CloseDialog();
-
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/src/clients/inst_worker_initial.ycp new/yast2-installation-2.16.11/src/clients/inst_worker_initial.ycp
--- old/yast2-installation-2.16.10/src/clients/inst_worker_initial.ycp 2007-10-05 17:06:32.000000000 +0200
+++ new/yast2-installation-2.16.11/src/clients/inst_worker_initial.ycp 2008-01-28 12:55:30.000000000 +0100
@@ -49,11 +49,13 @@
SetInitialInstallation ();
// All stages
- CreateUI();
+ SetUIContent();
// Cleanup and other settings
InitFirstStageInstallationSystem();
+ SetDiskActivationModule();
+
// Redraw steps before mouse is initialized
// Bugzilla #296406
UpdateWizardSteps ();
@@ -69,8 +71,6 @@
if (!Mode::screen_shot() && !Stage::firstboot())
WFM::CallFunction ("inst_check_autoinst_mode", []);
- SetDiskActivationModule();
-
symbol ret = nil;
/* --- Runing the installation workflow --- */
@@ -91,8 +91,5 @@
// All Sources and Target need to be released...
FinishInstallation (ret);
- // Created UI needs to be destroyed
- UI::CloseDialog();
-
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/src/include/inst_inc_all.ycp new/yast2-installation-2.16.11/src/include/inst_inc_all.ycp
--- old/yast2-installation-2.16.10/src/include/inst_inc_all.ycp 2007-11-26 10:49:49.000000000 +0100
+++ new/yast2-installation-2.16.11/src/include/inst_inc_all.ycp 2008-01-28 12:55:30.000000000 +0100
@@ -45,8 +45,8 @@
Wizard::SetTitleIcon("yast-inst-mode");
}
- void CreateUI () {
- Wizard::OpenNextBackStepsDialog();
+ void SetUIContent () {
+ // Wizard::OpenNextBackStepsDialog();
SetInitializingUI ();
}
@@ -166,7 +166,6 @@
ProductControl::DisabledModules = add (ProductControl::DisabledModules,
"disks_activate");
}
- retranslateWizardDialog();
}
} //end of include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/startup/common/arch.sh new/yast2-installation-2.16.11/startup/common/arch.sh
--- old/yast2-installation-2.16.10/startup/common/arch.sh 2007-10-05 17:06:32.000000000 +0200
+++ new/yast2-installation-2.16.11/startup/common/arch.sh 2008-01-28 15:12:56.000000000 +0100
@@ -12,7 +12,7 @@
# DESCRIPTION : Common used functions used for the YaST2 startup process
# : refering to architecture issues
# :
-# STATUS : $Id: arch.sh 19738 2004-10-05 14:14:26Z ms $
+# STATUS : $Id: arch.sh 43948 2008-01-28 14:12:56Z aschnell $
#----------------
#
#----[ is_iseries ]-----#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/startup/common/functions.sh new/yast2-installation-2.16.11/startup/common/functions.sh
--- old/yast2-installation-2.16.10/startup/common/functions.sh 2007-10-05 17:06:32.000000000 +0200
+++ new/yast2-installation-2.16.11/startup/common/functions.sh 2008-01-28 15:12:56.000000000 +0100
@@ -12,7 +12,7 @@
# DESCRIPTION : Common used functions for YaST2 startup
# :
# :
-# STATUS : $Id: functions.sh 19738 2004-10-05 14:14:26Z ms $
+# STATUS : $Id: functions.sh 43948 2008-01-28 14:12:56Z aschnell $
#----------------
#
#=============================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/startup/common/language.sh new/yast2-installation-2.16.11/startup/common/language.sh
--- old/yast2-installation-2.16.10/startup/common/language.sh 2007-10-05 17:06:32.000000000 +0200
+++ new/yast2-installation-2.16.11/startup/common/language.sh 2008-01-28 15:16:13.000000000 +0100
@@ -4,7 +4,7 @@
# PROJECT : YaST (Yet another Setup Tool v2)
# COPYRIGHT : (c) 2004 SUSE Linux AG, Germany. All rights reserved
# :
-# AUTHORS : Marcus Schaefer
+# AUTHORS : Marcus Schaefer
# :
# :
# BELONGS TO : System installation and Administration
@@ -12,7 +12,7 @@
# DESCRIPTION : Common used functions used for the YaST2 startup process
# : refering to language environment issues
# :
-# STATUS : $Id: language.sh 27279 2006-01-24 12:04:37Z ms $
+# STATUS : $Id: language.sh 43949 2008-01-28 14:16:13Z aschnell $
#----------------
#
#----[ check_run_fbiterm ]----#
@@ -22,7 +22,7 @@
# handle the CJK language mangle on linux console
# set flag value in RUN_FBITERM
# ---
- RUN_FBITERM=0
+ RUN_FBITERM=0
if test "$MEM_TOTAL" -lt "57344" ; then
return
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/startup/common/logging.sh new/yast2-installation-2.16.11/startup/common/logging.sh
--- old/yast2-installation-2.16.10/startup/common/logging.sh 2007-10-05 17:06:32.000000000 +0200
+++ new/yast2-installation-2.16.11/startup/common/logging.sh 2008-01-28 15:12:56.000000000 +0100
@@ -12,7 +12,7 @@
# DESCRIPTION : Common used functions used for the YaST2 startup process
# : refering to logging issues
# :
-# STATUS : $Id: logging.sh 19738 2004-10-05 14:14:26Z ms $
+# STATUS : $Id: logging.sh 43948 2008-01-28 14:12:56Z aschnell $
#----------------
#
#----[ set_syslog ]-----#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/startup/common/network.sh new/yast2-installation-2.16.11/startup/common/network.sh
--- old/yast2-installation-2.16.10/startup/common/network.sh 2007-10-05 17:06:32.000000000 +0200
+++ new/yast2-installation-2.16.11/startup/common/network.sh 2008-01-28 15:12:56.000000000 +0100
@@ -12,7 +12,7 @@
# DESCRIPTION : Common used functions used for the YaST2 startup process
# : refering to network environment issues
# :
-# STATUS : $Id: network.sh 33623 2006-10-24 08:59:12Z ms $
+# STATUS : $Id: network.sh 43948 2008-01-28 14:12:56Z aschnell $
#----------------
#
#----[ is_iface_up ]-----#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/startup/common/stage.sh new/yast2-installation-2.16.11/startup/common/stage.sh
--- old/yast2-installation-2.16.10/startup/common/stage.sh 2007-10-05 17:06:32.000000000 +0200
+++ new/yast2-installation-2.16.11/startup/common/stage.sh 2008-01-28 15:12:56.000000000 +0100
@@ -17,7 +17,7 @@
# : used for the Second-Stage scripts
# :
# :
-# STATUS : $Id: stage.sh 28694 2006-03-08 10:28:53Z ms $
+# STATUS : $Id: stage.sh 43948 2008-01-28 14:12:56Z aschnell $
#----------------
#
#----[ createStageList ]-----#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/startup/YaST2.call new/yast2-installation-2.16.11/startup/YaST2.call
--- old/yast2-installation-2.16.10/startup/YaST2.call 2008-01-24 15:23:05.000000000 +0100
+++ new/yast2-installation-2.16.11/startup/YaST2.call 2008-01-28 14:39:02.000000000 +0100
@@ -16,13 +16,12 @@
# : according to the possible installation environments
# : These are:
# : ---
-# : - Standard Installation Qt/X11 or text based
+# : - Standard Installation X11 or text based
# : - Via serial line ttyS0/115200 baud, 8N1, RTS/CTS
# : which is the same as the NCURSES mode
# : - VNC Installation via browser
# :
-# :
-# STATUS : $Id: YaST2.call 43886 2008-01-24 14:23:05Z aschnell $
+# STATUS : $Id: YaST2.call 43944 2008-01-28 13:39:01Z aschnell $
#----------------
#
#set -x
@@ -61,6 +60,8 @@
# server is running, detach oom-killer from it
echo -n '-17' > /proc/$xserver_pid/oom_adj
server_running=1
+ # tweak server (see bnc #345186)
+ xset r on
break
fi
done
@@ -100,12 +101,12 @@
done
}
-#----[ count_qt_geometry ]----#
-function count_qt_geometry () {
+#----[ count_x11_geometry ]----#
+function count_x11_geometry () {
# current X-resolution, display 0
XRES=$(/usr/sbin/xquery -d :0 -r)
- log "\t===Qt Geometry==="
+ log "\t===X11 Geometry==="
log "\tResolution: ${XRES}"
# failed to get display info
@@ -181,16 +182,12 @@
log "\tUsed geometry: ${X_GEOMETRY}"
}
-#----[ prepare_for_qt ]----#
-function prepare_for_qt () {
+#----[ prepare_for_x11 ]----#
+function prepare_for_x11 () {
#------------------------------------------------------
-# prepare Qt installation
+# prepare X11 installation
# ---
local fbdevname
- #=============================================
- # Setup Qt environment
- #---------------------------------------------
- set_inst_qt_env
set_splash 100
#=============================================
@@ -239,7 +236,7 @@
# Let the X11 fbdev driver use whatever the kernel driver uses
platinum|control|valkyrie|OFfb)
;;
- # Force DefaultDepth 16, or QT will not look nice
+ # Force DefaultDepth 16, or Qt/Gtk will not look nice
# nvidiafb uses 'NV%x'
# rivafb uses 'NV%x'
# aty128fb uses 'ATY Rage128'
@@ -272,12 +269,12 @@
fi
fi
#=============================================
- # set YaST2 Qt options for local displays
+ # set YaST2 Qt/Gtk options for local displays
#---------------------------------------------
if [ ! -z "$NEED_XSERVER" ];then
Y2_UI_ARGS="--noborder --auto-fonts"
##* Bugzilla #208307 Use only the fullscreen mode
-##* count_qt_geometry # currently not used
+##* count_x11_geometry # currently not used
##* if [ "${X_GEOMETRY}" == "" ]; then
log "\tUI_args: Running in fullscreen mode"
Y2_UI_ARGS="${Y2_UI_ARGS} --fullscreen"
@@ -288,6 +285,20 @@
fi
}
+
+#----[ prepare_for_qt ]----#
+function prepare_for_qt () {
+ set_inst_qt_env
+ prepare_for_x11
+}
+
+
+#----[ prepare_for_gtk ]----#
+function prepare_for_gtk () {
+ prepare_for_x11
+}
+
+
#----[ prepare_for_ncurses ]----#
function prepare_for_ncurses () {
#------------------------------------------------------
@@ -355,10 +366,10 @@
fi
}
-#----[ check_Qt ]----#
-function check_Qt () {
+#----[ check_x11 ]----#
+function check_x11 () {
#------------------------------------------------------
-# check if the prepared medium Qt is valid
+# check if the prepared medium X11 (Qt/Gtk) is valid
# ---
if [ ! -z "$NEED_XSERVER" ];then
if [ "$server_running" = 0 ];then
@@ -403,8 +414,12 @@
Y2_MODE=qt
fi
if ! check_qt ; then
- log "\tQt plugin check failed falling back to ncurses"
+ log "\tQt plugin check failed falling back to Gtk"
+ Y2_MODE=gtk
+ if ! check_gtk ; then
+ log "\tGtk plugin check failed falling back to ncurses"
Y2_MODE=ncurses
+ fi
fi
}
@@ -628,23 +643,27 @@
# 3) Medium prequalification
#---------------------------------------------
# Check which installation mediums can be used. There are
-# four mediums available: Qt(0) SSH(1), VNC(2) and NCURSES(3).
+# four 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"
# ---
-MEDIUM=(1 1 1 1)
+MEDIUM=(1 1 1 1 1)
#=============================================
# 3.1) prequalification checks for Qt
#---------------------------------------------
log "Starting prequalification checks..."
log "==================================="
-# 3.1.1) Qt plugin check...
+# 3.1.1) Qt and Gtk plugin check...
if ! check_qt ; then
log "\tQt plugin check failed -> Medium Qt disabled"
MEDIUM[0]=0
fi
+if ! check_gtk ; then
+ log "\tGtk plugin check failed -> Medium Gtk disabled"
+ MEDIUM[4]=0
+fi
# 3.1.2) X-Server module check...
# BEG IA64: use accelerated X11 driver
ia64_check_x11
@@ -652,8 +671,9 @@
XServerAccel=$XServer
if [ "$XServer" = "vmware" ];then
if [ ! -f "$X11_DRIVER_DIR/${XServer}_drv.so" ];then
- log "\t$XServer driver not installed -> Medium Qt disabled"
+ log "\t$XServer driver not installed -> Medium Qt and Gtk disabled"
MEDIUM[0]=0
+ MEDIUM[4]=0
fi
X11_CONFIG_ID=vmware
else
@@ -663,8 +683,9 @@
XServer=vesa
fi
if [ ! -f "$X11_DRIVER_DIR/${XServer}_drv.so" ];then
- log "\t$XServer driver not installed -> Medium Qt disabled"
+ log "\t$XServer driver not installed -> Medium Qt and Gtk disabled"
MEDIUM[0]=0
+ MEDIUM[4]=0
fi
X11_CONFIG_ID=$XServer
fi
@@ -678,14 +699,16 @@
load_module intel-agp
fi
MEDIUM[0]=1
+ MEDIUM[4]=1
XServer=$XServerAccel
X11_CONFIG_ID=0
fi
fi
# 3.1.3) Memory check >= 90MB for Qt/X11...
if [ $MEM_TOTAL -lt "$MEM_NEEDED" ];then
- log "\tMemory requirement > 90MB not fulfilled -> Medium Qt disabled"
+ log "\tMemory requirement > 90MB not fulfilled -> Medium Qt and Gtk disabled"
MEDIUM[0]=0
+ MEDIUM[4]=0
fi
# 3.1.4) Check if we need to start our own X11 server...
if [ -z "$DISPLAY" ];then
@@ -694,24 +717,27 @@
# 3.1.5) Check for xorg.conf...
if [ ! -f /etc/X11/xorg.conf ];then
if [ ! -f $Xorgconftempl ];then
- log "\tNo X11 configuration template found -> Medium Qt disabled"
+ log "\tNo X11 configuration template found -> Medium Qt and Gtk disabled"
MEDIUM[0]=0
+ MEDIUM[4]=0
else
cp $Xorgconftempl /etc/X11/xorg.conf
fi
fi
# 3.1.6) Check for WindowManager configuration
if [ ! -f $Xsharedir/fvwm/fvwmrc.yast2 ];then
- log "\tNo Windowmanager configuration found -> Medium Qt disabled"
+ log "\tNo Windowmanager configuration found -> Medium Qt and Gtk disabled"
MEDIUM[0]=0
+ MEDIUM[4]=0
fi
# 3.1.7) Check for remote display usage
if [ ! -z $Display_IP ];then
- log "\tRemote Display usage -> Medium Qt enabled"
+ log "\tRemote Display usage -> Medium Qt and Gtk enabled"
log "\tExporting DISPLAY to host: $Display_IP:0.0"
export DISPLAY="$Display_IP:0.0"
NEED_XSERVER=""
MEDIUM[0]=1
+ MEDIUM[4]=1
fi
#=============================================
@@ -788,8 +814,22 @@
case $SELECTED_MEDIUM in
QT) {
if [ ${MEDIUM[0]} -eq 0 ];then
- log "\tMedium Qt not available, falling back to ncurses"
- SELECTED_MEDIUM="NCURSES"
+ log "\tMedium Qt not available, falling back to Gtk"
+ SELECTED_MEDIUM="GTK"
+ if [ ${MEDIUM[4]} -eq 0 ];then
+ log "\tMedium Gtk not available, falling back to ncurses"
+ SELECTED_MEDIUM="NCURSES"
+ fi
+ fi
+ } ;;
+ GTK) {
+ if [ ${MEDIUM[4]} -eq 0 ];then
+ log "\tMedium Gtk not available, falling back to Qt"
+ SELECTED_MEDIUM="QT"
+ if [ ${MEDIUM[0]} -eq 0 ];then
+ log "\tMedium Qt not available, falling back to ncurses"
+ SELECTED_MEDIUM="NCURSES"
+ fi
fi
} ;;
SSH) {
@@ -812,6 +852,7 @@
#---------------------------------------------
case $SELECTED_MEDIUM in
QT) prepare_for_qt ; Y2_MODE=qt ;;
+ GTK) prepare_for_gtk ; Y2_MODE=gtk ;;
SSH) prepare_for_ssh ; Y2_MODE=ncurses ;;
VNC) prepare_for_vnc ; Y2_MODE=qt ;;
NCURSES) prepare_for_ncurses ; Y2_MODE=ncurses ;;
@@ -821,7 +862,8 @@
# 7) Check prepared medium
#---------------------------------------------
case $SELECTED_MEDIUM in
- QT) check_Qt ;;
+ QT) check_x11 ;;
+ GTK) check_x11 ;;
SSH) check_network ;;
VNC) check_vnc ;;
esac
@@ -860,4 +902,3 @@
#---------------------------------------------
exit $Y2_EXIT_CODE
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.10/VERSION new/yast2-installation-2.16.11/VERSION
--- old/yast2-installation-2.16.10/VERSION 2008-01-24 15:25:20.000000000 +0100
+++ new/yast2-installation-2.16.11/VERSION 2008-01-28 13:04:12.000000000 +0100
@@ -1 +1 @@
-2.16.10
+2.16.11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org