Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Mon Jun 8 16:18:41 CEST 2009.
--------
--- yast2-installation/yast2-installation.changes 2009-05-20 14:35:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2009-06-08 14:20:48.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jun 08 14:03:30 CEST 2009 - aschnell@suse.de
+
+- use minimalistic xorg.conf during installation (bnc #510015)
+- 2.18.16
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.18.15.tar.bz2
New:
----
yast2-installation-2.18.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.X20652/_old 2009-06-08 16:18:24.000000000 +0200
+++ /var/tmp/diff_new_pack.X20652/_new 2009-06-08 16:18:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.18.15)
+# spec file for package yast2-installation (Version 2.18.16)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-installation
-Version: 2.18.15
+Version: 2.18.16
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.18.15.tar.bz2
+Source0: yast2-installation-2.18.16.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
# xmllint
@@ -123,7 +123,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.18.15
+%setup -n yast2-installation-2.18.16
%build
%{prefix}/bin/y2tool y2autoconf
@@ -193,6 +193,9 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Mon Jun 08 2009 aschnell@suse.de
+- use minimalistic xorg.conf during installation (bnc #510015)
+- 2.18.16
* Wed May 20 2009 aschnell@suse.de
- moved .proc.mounts agent from yast2-installation to yast2 (bnc
[#504429])
++++++ yast2-installation-2.18.15.tar.bz2 -> yast2-installation-2.18.16.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.15/configure new/yast2-installation-2.18.16/configure
--- old/yast2-installation-2.18.15/configure 2009-05-20 14:28:04.000000000 +0200
+++ new/yast2-installation-2.18.16/configure 2009-06-08 14:04:43.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-installation 2.18.15.
+# Generated by GNU Autoconf 2.63 for yast2-installation 2.18.16.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.18.15'
-PACKAGE_STRING='yast2-installation 2.18.15'
+PACKAGE_VERSION='2.18.16'
+PACKAGE_STRING='yast2-installation 2.18.16'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1285,7 +1285,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.18.15 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.18.16 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1357,7 +1357,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.18.15:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.18.16:";;
esac
cat <<\_ACEOF
@@ -1437,7 +1437,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.18.15
+yast2-installation configure 2.18.16
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1451,7 +1451,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.18.15, which was
+It was created by yast2-installation $as_me 2.18.16, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2298,7 +2298,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.18.15'
+ VERSION='2.18.16'
cat >>confdefs.h <<_ACEOF
@@ -2522,7 +2522,7 @@
-VERSION="2.18.15"
+VERSION="2.18.16"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -3711,7 +3711,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.18.15, which was
+This file was extended by yast2-installation $as_me 2.18.16, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3761,7 +3761,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-installation config.status 2.18.15
+yast2-installation config.status 2.18.16
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.15/configure.in new/yast2-installation-2.18.16/configure.in
--- old/yast2-installation-2.18.15/configure.in 2009-05-20 14:27:57.000000000 +0200
+++ new/yast2-installation-2.18.16/configure.in 2009-06-08 14:04:37.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.18.15, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.18.16, 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.18.15"
+VERSION="2.18.16"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.15/control/control.openSUSE.xml new/yast2-installation-2.18.16/control/control.openSUSE.xml
--- old/yast2-installation-2.18.15/control/control.openSUSE.xml 2009-05-18 17:10:14.000000000 +0200
+++ new/yast2-installation-2.18.16/control/control.openSUSE.xml 2009-05-26 10:13:11.000000000 +0200
@@ -391,13 +391,13 @@
GNOME desktop description - It hould not be wider than 75 characters
but it can take more lines then the original one.
-->
- <label>GNOME 2.26 is the latest desktop from the GNOME Project.
+ <label>GNOME 2.28 is the latest desktop from the GNOME Project.
It combines stability and maturity with incremental innovations.</label>
<!--
KDE desktop description - It hould not be wider than 75 characters
but it can take more lines then the original one.
-->
- <label>KDE 4.2 is the latest stable desktop released by the KDE Project.
+ <label>KDE 4.3 is the latest stable desktop released by the KDE Project.
It delivers an innovative, highly integrated desktop environment
with a modern look and feel.</label>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.15/startup/arch/i386/Makefile.am new/yast2-installation-2.18.16/startup/arch/i386/Makefile.am
--- old/yast2-installation-2.18.15/startup/arch/i386/Makefile.am 2009-04-30 15:14:29.000000000 +0200
+++ new/yast2-installation-2.18.16/startup/arch/i386/Makefile.am 2009-06-08 13:47:31.000000000 +0200
@@ -6,7 +6,6 @@
install-data-local:
-install -d -m 755 $(DESTDIR)/$(ystartupbindir)
-ystartupbin_SCRIPTS = \
- x11.sh
+ystartupbin_SCRIPTS =
EXTRA_DIST = $(ystartupbin_SCRIPTS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.15/startup/arch/i386/Makefile.in new/yast2-installation-2.18.16/startup/arch/i386/Makefile.in
--- old/yast2-installation-2.18.15/startup/arch/i386/Makefile.in 2009-05-20 14:28:09.000000000 +0200
+++ new/yast2-installation-2.18.16/startup/arch/i386/Makefile.in 2009-06-08 14:04:46.000000000 +0200
@@ -177,9 +177,7 @@
# Makefile.am for installation/startup
#
ystartupbindir = $(ystartupdir)/startup/arch/i386
-ystartupbin_SCRIPTS = \
- x11.sh
-
+ystartupbin_SCRIPTS =
EXTRA_DIST = $(ystartupbin_SCRIPTS)
all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.15/startup/arch/i386/x11.sh new/yast2-installation-2.18.16/startup/arch/i386/x11.sh
--- old/yast2-installation-2.18.15/startup/arch/i386/x11.sh 2009-04-30 15:14:29.000000000 +0200
+++ new/yast2-installation-2.18.16/startup/arch/i386/x11.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-function i386_check_x11 () {
- if test -x /sbin/lspci && /sbin/lspci -n | grep "0300: 8086" | \
- grep -q -E "7121|7123|7125|1132|27ae"; then
- log "\tHardware dependent: use accelerated driver on Intel 810/815/945GME"
- export acceleratedx=1
- fi
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.15/startup/arch/ia64/Makefile.am new/yast2-installation-2.18.16/startup/arch/ia64/Makefile.am
--- old/yast2-installation-2.18.15/startup/arch/ia64/Makefile.am 2009-04-30 15:14:29.000000000 +0200
+++ new/yast2-installation-2.18.16/startup/arch/ia64/Makefile.am 2009-06-08 13:47:55.000000000 +0200
@@ -6,7 +6,6 @@
install-data-local:
-install -d -m 755 $(DESTDIR)/$(ystartupbindir)
-ystartupbin_SCRIPTS = \
- x11.sh
+ystartupbin_SCRIPTS =
EXTRA_DIST = $(ystartupbin_SCRIPTS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.15/startup/arch/ia64/Makefile.in new/yast2-installation-2.18.16/startup/arch/ia64/Makefile.in
--- old/yast2-installation-2.18.15/startup/arch/ia64/Makefile.in 2009-05-20 14:28:09.000000000 +0200
+++ new/yast2-installation-2.18.16/startup/arch/ia64/Makefile.in 2009-06-08 14:04:46.000000000 +0200
@@ -177,9 +177,7 @@
# Makefile.am for installation/startup
#
ystartupbindir = $(ystartupdir)/startup/arch/ia64
-ystartupbin_SCRIPTS = \
- x11.sh
-
+ystartupbin_SCRIPTS =
EXTRA_DIST = $(ystartupbin_SCRIPTS)
all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.15/startup/arch/ia64/x11.sh new/yast2-installation-2.18.16/startup/arch/ia64/x11.sh
--- old/yast2-installation-2.18.15/startup/arch/ia64/x11.sh 2009-04-30 15:14:29.000000000 +0200
+++ new/yast2-installation-2.18.16/startup/arch/ia64/x11.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-function ia64_check_x11 () {
- [ -n "$HOSTTYPE" ] || HOSTTYPE=$(arch)
- if [ "$HOSTTYPE" = "ia64" ];then
- log "\tArchitecture dependent: use accelerated driver on ia64"
- export acceleratedx=1
- fi
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.15/startup/YaST2.call new/yast2-installation-2.18.16/startup/YaST2.call
--- old/yast2-installation-2.18.15/startup/YaST2.call 2009-04-30 15:14:29.000000000 +0200
+++ new/yast2-installation-2.18.16/startup/YaST2.call 2009-06-08 14:19:53.000000000 +0200
@@ -22,7 +22,7 @@
# : which is the same as the NCURSES mode
# : - VNC Installation via browser
# :
-# STATUS : $Id: YaST2.call 53430 2008-11-19 15:04:59Z locilka $
+# STATUS : $Id: YaST2.call 57486 2009-06-08 12:19:52Z aschnell $
#----------------
#
#set -x
@@ -68,120 +68,6 @@
done
}
-#----[ get_bus_id ]----#
-function get_bus_id () {
-#------------------------------------------------------
-# ask the PCi bus for the location of the first
-# graphics card.
-# ---
- for line in $(/sbin/lspci -n | grep "Class 0300" | cut -f 1 -d " ");do
- echo $line |\
- grep -q -E "^[0-9a-f]{2}:[0-9a-f]{2}\.[0-9a-f]"
- if [ $? = 0 ];then
- PCIBus=$(echo $line | cut -f1 -d:);
- PCISlot=$(echo $line | cut -f2 -d: | cut -f 1 -d.);
- PCIFunc=$(echo $line | cut -f2 -d.);
- log "\tFound standard BusID: $PCIBus:$PCISlot:$PCIFunc"
- printf "PCI:%d@0:%d:%d" \
- 0x$PCIBus 0x$PCISlot 0x$PCIFunc
- break
- else
- echo $line |\
- grep -q -E "^[0-9a-f]{4}:[0-9a-f]{2}:[0-9a-f]{2}\.[0-9a-f]"
- if [ $? = 0 ];then
- PCIDomain=$(echo $line | cut -f1 -d:);
- PCIBus=$(echo $line | cut -f2 -d:);
- PCISlot=$(echo $line | cut -f3 -d: | cut -f 1 -d.);
- PCIFunc=$(echo $line | cut -f2 -d.);
- log "\tFound domain BusID: $PCIBus@$PCIDomain:$PCISlot $PCIFunc"
- printf "PCI:%d@%d:%d:%d" \
- 0x$PCIBus 0x$PCIDomain 0x$PCISlot 0x$PCIFunc
- break
- fi
- fi
- done
-}
-
-#----[ count_x11_geometry ]----#
-function count_x11_geometry () {
- # current X-resolution, display 0
- XRES=$(/usr/sbin/xquery -d :0 -r)
-
- log "\t===X11 Geometry==="
- log "\tResolution: ${XRES}"
-
- # failed to get display info
- if [ "$?" != "0" ]; then
- X_GEOMETRY=""
- return
- fi
-
- # current X and Y resolution
- XRES_X=$(echo $XRES | sed '
- s|[0123456789]\+ \([0123456789]\+\)x[0123456789]\+|\1|
- s|[^0123456789]||g')
- XRES_Y=$(echo $XRES | sed '
- s|[0123456789]\+ [0123456789]\+x\([0123456789]\+\)|\1|
- s|[^0123456789]||g')
-
- log "\tX: ${XRES_X}"
- log "\tY: ${XRES_Y}"
-
- # default values
- OFFSET_X=0
- OFFSET_Y=0
- BACKGROUND_IMAGE=""
-
- # wrong X and/or Y resolution
- if [ "${XRES_X}" == "" ] || [ "${XRES_Y}" == "" ]; then
- X_GEOMETRY=""
- log "\tError: Cannot get X and/or Y from given resolution"
- return
- # reasonable sizes
- else
- # must be bigger or equal to 1400x1050
- if [ "$(expr $XRES_X \>= 1400)" == "1" ] && [ "$(expr $XRES_Y \>= 1050)" == "1" ]; then
- WINDOW_SIZE_X=1024
- WINDOW_SIZE_Y=786
- # exception for PPC: 832x624, see bugzilla #207321
- elif [ "${XRES_X}" == "832" ] && [ "${XRES_Y}" == "624" ]; then
- WINDOW_SIZE_X=${XRES_X}
- WINDOW_SIZE_Y=${XRES_Y}
- # must be bigger or equal to 800x600
- elif [ "$(expr $XRES_X \>= 800)" == "1" ] && [ "$(expr $XRES_Y \>= 600)" == "1" ]; then
- WINDOW_SIZE_X=800
- WINDOW_SIZE_Y=600
- # or fullscreen
- else
- WINDOW_SIZE_X=${XRES_X}
- WINDOW_SIZE_Y=${XRES_Y}
- fi
-
- # Conversion from jpg to png is done later
- BACKGROUND_IMAGE="/usr/lib/YaST2/startup/InstallImages/${XRES_X}x${XRES_Y}.jpg"
-
- # X and Y offsets
- OFFSET_X=$(expr ${XRES_X} - ${WINDOW_SIZE_X})
- OFFSET_X=$(expr ${OFFSET_X} / 2)
- OFFSET_Y=$(expr ${XRES_Y} - ${WINDOW_SIZE_Y})
- OFFSET_Y=$(expr ${OFFSET_Y} / 2)
- fi
-
- log "\tWindow size X: ${WINDOW_SIZE_X}"
- log "\tWindow size Y: ${WINDOW_SIZE_Y}"
- log "\tOffset X: ${OFFSET_X}"
- log "\tOffset Y: ${OFFSET_Y}"
-
- if [ "${OFFSET_X}" == "0" ] || [ "${OFFSET_Y}" == "0" ] || [ "${OFFSET_X}" == "" ] || [ "${OFFSET_Y}" == "" ]; then
- # will run in fullscreen mode
- X_GEOMETRY=""
- else
- # final window geometry, 'Window_XxWindow_Y+Offset_X+Offset_Y'
- X_GEOMETRY="${WINDOW_SIZE_X}x${WINDOW_SIZE_Y}+${OFFSET_X}+${OFFSET_Y}"
- fi
-
- log "\tUsed geometry: ${X_GEOMETRY}"
-}
#----[ prepare_for_x11 ]----#
function prepare_for_x11 () {
@@ -192,71 +78,6 @@
set_splash 100
#=============================================
- # patch X11 conf. if not update/continue mode
- #---------------------------------------------
- if [ ! -f /var/lib/YaST2/reconfig_system ];then
- if [ ! -f /var/lib/YaST2/runme_at_boot ];then
- if [ ! -f /etc/X11/xorg.conf.instorig ];then
- # create backup copy...
- cp /etc/X11/xorg.conf /etc/X11/xorg.conf.instorig
-
- # Activate correct device/screen section...
- sed -e "s#Screen.*Screen\[.*\]#Screen "\""Screen[$X11_CONFIG_ID]#" \
- /etc/X11/xorg.conf >/etc/X11/xorg.conf.new
- mv /etc/X11/xorg.conf.new /etc/X11/xorg.conf
-
- # update core pointer input device section...
- if [ -f "/usr/sbin/xupdate" ];then
- cat /etc/X11/xorg.conf | \
- /usr/sbin/xupdate > /etc/X11/xorg.conf.new
- mv /etc/X11/xorg.conf.new /etc/X11/xorg.conf
- fi
-
- # update driver and busID if accelerated driver should be used...
- if [ "$X11_CONFIG_ID" = 0 ];then
- # replace BusID placeholder with real busID
- XBusID=$(get_bus_id)
- if [ ! -z "$XBusID" ];then
- sed -e 's/#BusID/BusID/' \
- -e "s#1:0:0#$XBusID#" /etc/X11/xorg.conf \
- > /etc/X11/xorg.conf.new
- mv /etc/X11/xorg.conf.new /etc/X11/xorg.conf
- fi
-
- # replace driver placeholder with real name
- sed -e "s#ChangeMe#$XServer#" /etc/X11/xorg.conf \
- > /etc/X11/xorg.conf.new
- mv /etc/X11/xorg.conf.new /etc/X11/xorg.conf
- fi
- # check DefaultDepth setup
- if [ -f /sys/class/graphics/fb0/name ];then
- read fbdevname < /sys/class/graphics/fb0/name
- case "$fbdevname" in
- # The DefaultDepth 16 will not work if the card does not
- # have enough video ram, or if 15bit has to be used
- # Let the X11 fbdev driver use whatever the kernel driver uses
- platinum|control|valkyrie|OFfb)
- ;;
- # Force DefaultDepth 16, or Qt/Gtk will not look nice
- # nvidiafb uses 'NV%x'
- # rivafb uses 'NV%x'
- # aty128fb uses 'ATY Rage128'
- # radeonfb uses 'ATI Radeon XX '
- NV*|*Rage128|*Radeon*)
- sed -i -e "/@DefaultDepth@/s/^.*/DefaultDepth 16/" /etc/X11/xorg.conf
- ;;
- # drivers that are not yet tested
- # atyfb uses 'ATY Mach64', may not have enough video ram
- MATROX|*Mach64)
- ;;
- *)
- ;;
- esac
- fi
- fi
- fi
- fi
- #=============================================
# start X-Server and wait until ready
#---------------------------------------------
if [ ! -z "$NEED_XSERVER" ];then
@@ -269,20 +90,12 @@
log "\tX-Server is ready: $xserver_pid"
fi
fi
+
#=============================================
# 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_x11_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
+ Y2_UI_ARGS="--noborder --auto-fonts --fullscreen"
fi
}
@@ -445,38 +258,6 @@
fi
}
-#----[ set background image for yast ]----#
-function set_yast_background () {
- # set up a background if any needed
- if [ "${BACKGROUND_IMAGE}" != "" ]; then
- TMPDIR="/tmp/installimg"
-
- # selected image doesn't exist, usign fallback
- if ! [ -e "${BACKGROUND_IMAGE}" ]; then
- BACKGROUND_IMAGE="/usr/lib/YaST2/startup/InstallImages/fallback.png"
- log "\tNot a supported resolution, using fallback image"
- # convert stored JPG to PNG
- else
- log "\tUsing background: ${BACKGROUND_IMAGE}"
- mkdir -p ${TMPDIR}
- # convert JPG to PNM
- jpegtopnm ${BACKGROUND_IMAGE} > ${TMPDIR}/img.pnm 2>${TMPDIR}/jpegtopnm.log
- # convert PNM to PNG
- pnmtopng ${TMPDIR}/img.pnm > ${TMPDIR}/img.png 2>${TMPDIR}/pnmtopng.log
- # remove PNM
- rm -rf ${TMPDIR}/img.pnm
- # set the BACKGROUND_IMAGE to the converted one
- BACKGROUND_IMAGE=${TMPDIR}/img.png
- fi
-
- # set the background
- # FIXME
-
- # remove PNG silently if exists
- rm -rf ${TMPDIR}/img.png
- fi
-}
-
function ssh_reboot_message()
{
@@ -520,9 +301,6 @@
OPT_FBITERM=
fi
-##* # bugzilla #208307
-##* set_yast_background # currently not used
-
log "\tStarting YaST2:"
log "\tMODULE_NAME: $Y2_MODULE_NAME"
log "\tMODE_FLAGS: $Y2_MODE_FLAGS"
@@ -614,8 +392,6 @@
#---------------------------------------------
. /usr/lib/YaST2/startup/common/functions.sh
. /usr/lib/YaST2/startup/requires
-. /usr/lib/YaST2/startup/arch/ia64/x11.sh
-. /usr/lib/YaST2/startup/arch/i386/x11.sh
#=============================================
# 1.1) set splash progress bar to 90%
@@ -636,13 +412,7 @@
# 2.1) setup PATH
PATH=$ybindir:$PATH
[ -z Xstartpath ] || PATH=/var/X11R6/bin:$PATH
-#=============================================
-# 2.2) get X11 driver directory
-#---------------------------------------------
-X11_DRIVER_DIR=$Xdriverpath
-if [ -d $Xdriver64path ];then
- X11_DRIVER_DIR=$Xdriver64path
-fi
+
#=============================================
# 2.3) obtain RAM size in Kb
#---------------------------------------------
@@ -650,13 +420,7 @@
if [ ${#MEM_TOTAL} -gt 9 ];then
MEM_TOTAL=1000000000
fi
-#=============================================
-# 2.4) check for valid framebuffer
-#---------------------------------------------
-FBDEV_OK=0
-if (: < /dev/fb0) 2>/dev/null ; then
- FBDEV_OK=1
-fi
+
#=============================================
# 2.5) setup installation mode (update y/n)
#---------------------------------------------
@@ -699,48 +463,9 @@
log "\tGtk plugin check failed -> Medium Gtk disabled"
MEDIUM[4]=0
fi
-# 3.1.2) X-Server module check...
-ia64_check_x11
-i386_check_x11
-XServerAccel=$XServer
-if [ "$XServer" = "vmware" ];then
- if [ ! -f "$X11_DRIVER_DIR/${XServer}_drv.so" ];then
- log "\t$XServer driver not installed -> Medium Qt and Gtk disabled"
- MEDIUM[0]=0
- MEDIUM[4]=0
- fi
- X11_CONFIG_ID=vmware
-else
- XServer=fbdev
- if [ $FBDEV_OK -eq 0 ];then
- log "\tNo Framebuffer available: Using vesa driver"
- XServer=vesa
- fi
- if [ ! -f "$X11_DRIVER_DIR/${XServer}_drv.so" ];then
- log "\t$XServer driver not installed -> Medium Qt and Gtk disabled"
- MEDIUM[0]=0
- MEDIUM[4]=0
- fi
- X11_CONFIG_ID=$XServer
-fi
-if [ "$acceleratedx" = "1" ];then
- if [ ! -f "$X11_DRIVER_DIR/${XServerAccel}_drv.so" ];then
- log "\t$XServerAccel driver not installed -> X11 acceleration disabled"
- else
- log "\tUsing accelerated driver -> $XServerAccel"
- if [ $XServerAccel = "intel" ];then
- log "\tIntel driver requested: loading intel agp module"
- 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...
+# 3.1.3) Memory check >= $MEM_NEEDED for Qt/Gtk/X11...
if [ $MEM_TOTAL -lt "$MEM_NEEDED" ];then
- log "\tMemory requirement > 90MB not fulfilled -> Medium Qt and Gtk disabled"
+ log "\tMemory requirement > $MEM_NEEDED not fulfilled -> Medium Qt and Gtk disabled"
MEDIUM[0]=0
MEDIUM[4]=0
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.15/VERSION new/yast2-installation-2.18.16/VERSION
--- old/yast2-installation-2.18.15/VERSION 2009-05-20 12:45:30.000000000 +0200
+++ new/yast2-installation-2.18.16/VERSION 2009-06-08 14:03:23.000000000 +0200
@@ -1 +1 @@
-2.18.15
+2.18.16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org