Author: aschnell Date: Tue Oct 4 11:25:30 2011 New Revision: 66217 URL: http://svn.opensuse.org/viewcvs/yast?rev=66217&view=rev Log: - don't call lspci on s390 (bnc#720108) Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP2-Branch/installation/startup/arch/i386/x11.sh Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/VERSION?rev=66217&r1=66216&r2=66217&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/VERSION Tue Oct 4 11:25:30 2011 @@ -1 +1 @@ -2.17.92 +2.17.93 Modified: branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes?rev=66217&r1=66216&r2=66217&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Tue Oct 4 11:25:30 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 04 11:16:45 CEST 2011 - aschnell@suse.de + +- don't call lspci on s390 (bnc#720108) +- 2.17.93 + +------------------------------------------------------------------- Thu Sep 22 08:21:57 UTC 2011 - jsrain@suse.cz - fixed progress during live installation (bnc#717818) Modified: branches/SuSE-Code-11-SP2-Branch/installation/startup/arch/i386/x11.sh URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/startup/arch/i386/x11.sh?rev=66217&r1=66216&r2=66217&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/startup/arch/i386/x11.sh (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/startup/arch/i386/x11.sh Tue Oct 4 11:25:30 2011 @@ -1,6 +1,11 @@ #!/bin/sh function i386_check_x11 () { + [ -n "$HOSTTYPE" ] || HOSTTYPE=$(arch) + if [ "$HOSTTYPE" == "s390" -o "$HOSTTYPE" == "s390x" ] ; then + return + fi + if test -x /sbin/lspci && /sbin/lspci -n | grep -q "0300: 8086"; then log "\tHardware dependent: use accelerated driver on Intel hardware" export acceleratedx=1 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org