Hello community,
here is the log from the commit of package yast2-installation
checked in at Mon Oct 9 17:45:12 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-10-02 17:05:34.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2006-10-09 16:53:01.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Oct 9 16:52:14 CEST 2006 - locilka@suse.cz
+
+- Merged SLES10 SP1 branch to openSUSE 10.2.
+- 2.14.0
+
+-------------------------------------------------------------------
+Mon Oct 9 09:33:31 CEST 2006 - locilka@suse.cz
+
+- Remove old eula.txt and then copy new one if exists (#208908).
+- Using the fullscreen mode again, background images temporarily
+ removed from the RPM build (#208307).
+- The default "Other Option" is Repair, not Boot (#208841).
+- Removed some unneeded imports from inst_clients.
+- 2.13.159
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.158.tar.bz2
New:
----
yast2-installation-2.14.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.jGXH9y/_old 2006-10-09 17:41:55.000000000 +0200
+++ /var/tmp/diff_new_pack.jGXH9y/_new 2006-10-09 17:41:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.158)
+# spec file for package yast2-installation (Version 2.14.0)
#
# Copyright (c) 2006 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.13.158
+Version: 2.14.0
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.158.tar.bz2
+Source0: yast2-installation-2.14.0.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-country yast2-devtools yast2-testsuite
Requires: yast2-slp yast2-firewall
@@ -38,8 +38,10 @@
# tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103)
Requires: tar gzip
# for the first/second stage of installation
-Requires: /usr/bin/jpegtopnm
-Requires: /usr/bin/pnmtopng
+# currently not used
+# bugzilla #208307
+#Requires: /usr/bin/jpegtopnm
+#Requires: /usr/bin/pnmtopng
Recommends: yast2-registration
PreReq: %fillup_prereq
Provides: yast
@@ -66,7 +68,7 @@
Jiri Srain
%prep
-%setup -n yast2-installation-2.13.158
+%setup -n yast2-installation-2.14.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -129,6 +131,16 @@
%endif
%changelog -n yast2-installation
+* Mon Oct 09 2006 - locilka@suse.cz
+- Merged SLES10 SP1 branch to openSUSE 10.2.
+- 2.14.0
+* Mon Oct 09 2006 - locilka@suse.cz
+- Remove old eula.txt and then copy new one if exists (#208908).
+- Using the fullscreen mode again, background images temporarily
+ removed from the RPM build (#208307).
+- The default "Other Option" is Repair, not Boot (#208841).
+- Removed some unneeded imports from inst_clients.
+- 2.13.159
* Mon Oct 02 2006 - locilka@suse.cz
- Merged proofread texts
- 2.13.158
++++++ yast2-installation-2.13.158.tar.bz2 -> yast2-installation-2.14.0.tar.bz2 ++++++
++++ 2594 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/Makefile.am new/yast2-installation-2.14.0/Makefile.am
--- old/yast2-installation-2.13.158/Makefile.am 2006-09-27 10:26:50.000000000 +0200
+++ new/yast2-installation-2.14.0/Makefile.am 2006-10-09 16:53:31.000000000 +0200
@@ -67,7 +67,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/VERSION new/yast2-installation-2.14.0/VERSION
--- old/yast2-installation-2.13.158/VERSION 2006-10-02 17:05:53.000000000 +0200
+++ new/yast2-installation-2.14.0/VERSION 2006-10-09 16:52:06.000000000 +0200
@@ -1 +1 @@
-2.13.158
+2.14.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/configure.in new/yast2-installation-2.14.0/configure.in
--- old/yast2-installation-2.13.158/configure.in 2006-09-27 10:26:50.000000000 +0200
+++ new/yast2-installation-2.14.0/configure.in 2006-10-09 16:53:31.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.155, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.14.0, http://bugs.opensuse.org/, yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.155"
+VERSION="2.14.0"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -209,7 +209,6 @@
startup/hooks/preSecondCall/Makefile
startup/hooks/preSecondStage/Makefile
startup/hooks/Makefile
-startup/InstallImages/Makefile
startup/Makefile
control/docs/examples/Makefile
control/docs/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/src/clients/copy_files_finish.ycp new/yast2-installation-2.14.0/src/clients/copy_files_finish.ycp
--- old/yast2-installation-2.13.158/src/clients/copy_files_finish.ycp 2006-06-26 09:10:54.000000000 +0200
+++ new/yast2-installation-2.14.0/src/clients/copy_files_finish.ycp 2006-10-09 13:28:35.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: copy_files_finish.ycp 28136 2006-02-17 22:58:49Z jsrain $
+ * $Id: copy_files_finish.ycp 33271 2006-10-09 11:28:31Z locilka $
*
*/
@@ -21,6 +21,7 @@
import "Installation";
import "Directory";
import "ProductControl";
+import "FileUtils";
any ret = nil;
string func = "";
@@ -84,11 +85,17 @@
Installation::destdir + Directory::etcdir + "/control_files/order.ycp");
}
- // Copy info.txt so it can be used in firstboot
- if (SCR::Read(.target.size, "/info.txt") > 0)
+ // Remove old eula.txt
+ // bugzilla #208908
+ string eula_txt = sformat ("%1%2/eula.txt", Installation::destdir, Directory::etcdir);
+ if (FileUtils::Exists (eula_txt)) {
+ SCR::Execute (.target.remove, eula_txt);
+ }
+
+ // Copy info.txt so it can be used in firstboot (new eula.txt)
+ if (FileUtils::Exists ("/info.txt"))
{
- SCR::Execute (.target.bash, "/bin/cp /info.txt " +
- Installation::destdir + Directory::etcdir + "/eula.txt");
+ SCR::Execute (.target.bash, sformat("/bin/cp /info.txt %1", eula_txt));
}
}
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/src/clients/inst_license.ycp new/yast2-installation-2.14.0/src/clients/inst_license.ycp
--- old/yast2-installation-2.13.158/src/clients/inst_license.ycp 2006-07-18 11:27:46.000000000 +0200
+++ new/yast2-installation-2.14.0/src/clients/inst_license.ycp 2006-10-09 13:28:35.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Generic License File
* Authors: Anas Nashif
*
- * $Id: inst_license.ycp 31870 2006-07-14 13:20:02Z jsrain $
+ * $Id: inst_license.ycp 33271 2006-10-09 11:28:31Z locilka $
*
*/
@@ -12,15 +12,9 @@
textdomain "installation";
-import "CustomDialogs";
import "Directory";
import "GetInstArgs";
-import "Installation";
-import "Language";
-import "Popup";
import "Stage";
-import "Wizard";
-import "InstShowInfo";
import "ProductLicense";
map display = UI::GetDisplayInfo();
@@ -65,6 +59,8 @@
}
else if (ask_ret == `next)
return `next;
+else if (ask_ret == `accepted)
+ return `next;
else
{
y2error ("Unknown return: %1", ask_ret);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/src/clients/inst_proposal.ycp new/yast2-installation-2.14.0/src/clients/inst_proposal.ycp
--- old/yast2-installation-2.13.158/src/clients/inst_proposal.ycp 2006-09-25 18:14:36.000000000 +0200
+++ new/yast2-installation-2.14.0/src/clients/inst_proposal.ycp 2006-10-09 13:28:35.000000000 +0200
@@ -7,7 +7,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_proposal.ycp 33112 2006-09-25 16:14:32Z locilka $
+ * $Id: inst_proposal.ycp 33271 2006-10-09 11:28:31Z locilka $
*
* Create and display reasonable proposal for basic
* installation and call sub-workflows as required
@@ -19,16 +19,13 @@
{
textdomain "installation";
- import "Arch";
import "Label";
import "Mode";
import "Stage";
- import "Installation";
import "AutoinstConfig";
import "Wizard";
import "HTML";
import "Popup";
- import "ProductControl";
import "Language";
import "GetInstArgs";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/src/clients/inst_release_notes.ycp new/yast2-installation-2.14.0/src/clients/inst_release_notes.ycp
--- old/yast2-installation-2.13.158/src/clients/inst_release_notes.ycp 2006-09-18 17:43:58.000000000 +0200
+++ new/yast2-installation-2.14.0/src/clients/inst_release_notes.ycp 2006-10-09 13:28:35.000000000 +0200
@@ -7,7 +7,7 @@
*
* Display release notes.
*
- * $Id: inst_release_notes.ycp 32950 2006-09-18 15:45:29Z locilka $
+ * $Id: inst_release_notes.ycp 33271 2006-10-09 11:28:31Z locilka $
*/
{
@@ -20,7 +20,6 @@
import "Directory";
import "Language";
import "Mode";
- import "String";
map argmap = GetInstArgs::argmap();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/src/clients/inst_startup.ycp new/yast2-installation-2.14.0/src/clients/inst_startup.ycp
--- old/yast2-installation-2.13.158/src/clients/inst_startup.ycp 2006-06-26 09:10:54.000000000 +0200
+++ new/yast2-installation-2.14.0/src/clients/inst_startup.ycp 2006-10-09 13:28:35.000000000 +0200
@@ -13,25 +13,19 @@
* - Probe all controllers for disks
* - Probe all disks for partition data
*
- * $Id: inst_startup.ycp 30854 2006-05-11 11:52:25Z jsrain $
+ * $Id: inst_startup.ycp 33271 2006-10-09 11:28:31Z locilka $
*/
{
textdomain "installation";
import "Arch";
- import "Mode";
- import "Linuxrc";
import "Installation";
import "Hotplug";
- import "Mouse";
- import "ModuleLoading";
- import "Storage";
import "StorageControllers";
import "StorageDevices";
import "Kernel"; // call constructor, extract cmdline
- import "Wizard";
import "Report";
y2milestone("inst_startup START");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/src/clients/inst_system_analysis.ycp new/yast2-installation-2.14.0/src/clients/inst_system_analysis.ycp
--- old/yast2-installation-2.13.158/src/clients/inst_system_analysis.ycp 2006-10-02 17:07:07.000000000 +0200
+++ new/yast2-installation-2.14.0/src/clients/inst_system_analysis.ycp 2006-10-09 13:28:35.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Installation mode selection, system analysis
* Authors: Jiri Srain
*
- * $Id: inst_system_analysis.ycp 33233 2006-10-02 15:07:05Z locilka $
+ * $Id: inst_system_analysis.ycp 33271 2006-10-09 11:28:31Z locilka $
*
*/
@@ -129,6 +129,8 @@
disk that will not boot. With this option, try to fix problems manually.
</p>");
+symbol current_expert_mode = `repair;
+
// see bugzilla #156529
term InstModeDialogContent (symbol pre_selected) {
term other_options_layout_fix = `Empty();
@@ -143,10 +145,10 @@
`VBox (
`Left (`RadioButton (`id (`repair), `opt (`notify),
// radio button
- _("Re&pair Installed System"), true)),
+ _("Re&pair Installed System"), (current_expert_mode == `repair))),
`Left (`RadioButton (`id (`boot), `opt (`notify),
// radio button
- _("Boot Installed &System")))
+ _("Boot Installed &System"), (current_expert_mode == `boot)))
)
)
);
@@ -270,7 +272,6 @@
boolean add_on_selected = (boolean) UI::QueryWidget (`id (`add_on), `Value);
// Probably buggy UI, in case of two radio button groups, the second one
// doesn't work (RadioButtonGroup (`id (`expert_options)))
-symbol current_expert_mode = `boot;
repeat {
ret = (symbol) UI::UserInput();
y2milestone("ret: %1", ret);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/src/modules/ProductLicense.ycp new/yast2-installation-2.14.0/src/modules/ProductLicense.ycp
--- old/yast2-installation-2.13.158/src/modules/ProductLicense.ycp 2006-09-25 14:42:07.000000000 +0200
+++ new/yast2-installation-2.14.0/src/modules/ProductLicense.ycp 2006-10-09 13:22:20.000000000 +0200
@@ -20,6 +20,7 @@
import "Stage";
import "Wizard";
import "Mode";
+import "FileUtils";
textdomain "installation";
@@ -217,7 +218,7 @@
{
license_dir = dir;
}
- if ((integer) SCR::Read (.target.size, "/info.txt") > 0)
+ if (FileUtils::Exists ("/info.txt"))
info_file = "/info.txt";
}
else
Binary files old/yast2-installation-2.13.158/startup/InstallImages/1024x768.jpg and new/yast2-installation-2.14.0/startup/InstallImages/1024x768.jpg differ
Binary files old/yast2-installation-2.13.158/startup/InstallImages/1152x768.jpg and new/yast2-installation-2.14.0/startup/InstallImages/1152x768.jpg differ
Binary files old/yast2-installation-2.13.158/startup/InstallImages/1280x1024.jpg and new/yast2-installation-2.14.0/startup/InstallImages/1280x1024.jpg differ
Binary files old/yast2-installation-2.13.158/startup/InstallImages/1280x800.jpg and new/yast2-installation-2.14.0/startup/InstallImages/1280x800.jpg differ
Binary files old/yast2-installation-2.13.158/startup/InstallImages/1400x1050.jpg and new/yast2-installation-2.14.0/startup/InstallImages/1400x1050.jpg differ
Binary files old/yast2-installation-2.13.158/startup/InstallImages/1600x1200.jpg and new/yast2-installation-2.14.0/startup/InstallImages/1600x1200.jpg differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/startup/InstallImages/Makefile.am new/yast2-installation-2.14.0/startup/InstallImages/Makefile.am
--- old/yast2-installation-2.13.158/startup/InstallImages/Makefile.am 2006-09-25 13:10:02.000000000 +0200
+++ new/yast2-installation-2.14.0/startup/InstallImages/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-#
-# Makefile.am for installation/startup/InstallImages
-#
-ystartupbindir = $(ystartupdir)/startup/InstallImages
-
-ystartupbin_SCRIPTS = $(wildcard *.jpg *.png)
-
-EXTRA_DIST = $(ystartupbin_SCRIPTS)
Binary files old/yast2-installation-2.13.158/startup/InstallImages/fallback.png and new/yast2-installation-2.14.0/startup/InstallImages/fallback.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/startup/Makefile.am new/yast2-installation-2.14.0/startup/Makefile.am
--- old/yast2-installation-2.13.158/startup/Makefile.am 2006-09-18 13:34:38.000000000 +0200
+++ new/yast2-installation-2.14.0/startup/Makefile.am 2006-10-09 14:38:47.000000000 +0200
@@ -12,4 +12,4 @@
requires
EXTRA_DIST = $(ystartupbin_SCRIPTS)
-SUBDIRS = First-Stage Second-Stage arch common hooks InstallImages
+SUBDIRS = First-Stage Second-Stage arch common hooks
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/startup/YaST2.call new/yast2-installation-2.14.0/startup/YaST2.call
--- old/yast2-installation-2.13.158/startup/YaST2.call 2006-09-22 11:09:14.000000000 +0200
+++ new/yast2-installation-2.14.0/startup/YaST2.call 2006-10-09 13:28:35.000000000 +0200
@@ -22,7 +22,7 @@
# : - VNC Installation via browser
# :
# :
-# STATUS : $Id: YaST2.call 33052 2006-09-22 09:10:52Z locilka $
+# STATUS : $Id: YaST2.call 33271 2006-10-09 11:28:31Z locilka $
#----------------
#
#set -x
@@ -261,14 +261,15 @@
#---------------------------------------------
if [ ! -z "$NEED_XSERVER" ];then
Y2_UI_ARGS="--noborder --auto-fonts"
- count_qt_geometry
- if [ "${X_GEOMETRY}" == "" ]; then
+##* Bugzilla #208307 Use only the fullscreen mode
+##* count_qt_geometry # currently not used
+##* if [ "${X_GEOMETRY}" == "" ]; then
log "\tUI_args: Running in fullscreen mode"
Y2_UI_ARGS="${Y2_UI_ARGS} --fullscreen"
- else
- log "\tUI_args: Running in window"
- Y2_UI_ARGS="${Y2_UI_ARGS} -geometry ${X_GEOMETRY}"
- fi
+##* else
+##* log "\tUI_args: Running in window"
+##* Y2_UI_ARGS="${Y2_UI_ARGS} -geometry ${X_GEOMETRY}"
+##* fi
fi
}
@@ -412,28 +413,8 @@
fi
}
-#----[ start_yast ]----#
-function start_yast () {
-#------------------------------------------------------
-# Start YaST2 refering to the contents of the Y2_*
-# startup variables
-# ---
- local overcommit
- read overcommit < /proc/sys/vm/overcommit_memory
- echo "*** Starting YaST2 ***"
- log "\tAllow big memory allocation: overcommit_memory=1"
- echo 1 > /proc/sys/vm/overcommit_memory
- if [ "$SPLASH" = yes -a -x /sbin/splash -a -n "$SPLASHCFG" ];then
- /sbin/splash -t "YaST running"
- fi
- export QT_IM_MODULE=xim
-
- if [ "$RUN_FBITERM" = "1" ]; then
- OPT_FBITERM=/usr/bin/fbiterm
- else
- OPT_FBITERM=
- fi
-
+#----[ set background image for yast ]----#
+function set_yast_background () {
# set up a background if any needed
if [ "${BACKGROUND_IMAGE}" != "" ]; then
TMPDIR="/tmp/installimg"
@@ -462,6 +443,32 @@
# remove PNG silently if exists
rm -rf ${TMPDIR}/img.png
fi
+}
+
+#----[ start_yast ]----#
+function start_yast () {
+#------------------------------------------------------
+# Start YaST2 refering to the contents of the Y2_*
+# startup variables
+# ---
+ local overcommit
+ read overcommit < /proc/sys/vm/overcommit_memory
+ echo "*** Starting YaST2 ***"
+ log "\tAllow big memory allocation: overcommit_memory=1"
+ echo 1 > /proc/sys/vm/overcommit_memory
+ if [ "$SPLASH" = yes -a -x /sbin/splash -a -n "$SPLASHCFG" ];then
+ /sbin/splash -t "YaST running"
+ fi
+ export QT_IM_MODULE=xim
+
+ if [ "$RUN_FBITERM" = "1" ]; then
+ OPT_FBITERM=/usr/bin/fbiterm
+ else
+ OPT_FBITERM=
+ fi
+
+##* # bugzilla #208307
+##* set_yast_background # currently not used
log "\tStarting YaST2:"
log "\tMODULE_NAME: $Y2_MODULE_NAME"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.158/startup/common/vnc.sh new/yast2-installation-2.14.0/startup/common/vnc.sh
--- old/yast2-installation-2.13.158/startup/common/vnc.sh 2006-09-04 15:59:37.000000000 +0200
+++ new/yast2-installation-2.14.0/startup/common/vnc.sh 2006-10-09 16:33:18.000000000 +0200
@@ -13,7 +13,7 @@
# DESCRIPTION : VNC helper functions to start the Xvnc server
# :
# :
-# STATUS : $Id: vnc.sh 32687 2006-09-04 13:53:31Z ms $
+# STATUS : $Id: vnc.sh 33280 2006-10-09 14:21:31Z locilka $
#----------------
. /etc/YaST2/XVersion
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org