Author: aschnell Date: Tue Apr 3 14:57:41 2012 New Revision: 67853 URL: http://svn.opensuse.org/viewcvs/yast?rev=67853&view=rev Log: - adapted to move of testX Removed: trunk/installation/src/config/fvwmrc.yast2 trunk/installation/src/config/preferences.yast2 Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/config/Makefile.am trunk/installation/startup/YaST2.call trunk/installation/yast2-installation.spec.in Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=67853&r1=67852&r2=67853&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Apr 3 14:57:41 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 03 14:56:55 CEST 2012 - aschnell@suse.de + +- adapted to move of testX + +------------------------------------------------------------------- Wed Mar 14 15:42:19 CET 2012 - aschnell@suse.de - create link yast.ssh for 2nd stage ssh installation (bnc#745340) Modified: trunk/installation/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/config/Makefile.am?rev=67853&r1=67852&r2=67853&view=diff ============================================================================== --- trunk/installation/src/config/Makefile.am (original) +++ trunk/installation/src/config/Makefile.am Tue Apr 3 14:57:41 2012 @@ -7,10 +7,6 @@ schemafilesdir = $(schemadir)/autoyast/rnc schemafiles_DATA = $(wildcard *.rnc) -# FIXME -icewmdir= ${sysconfdir}/icewm -icewm_DATA = preferences.yast2 - -EXTRA_DIST = $(desktop_DATA) $(icewm_DATA) $(modconfig_DATA) $(schemafiles_DATA) +EXTRA_DIST = $(desktop_DATA) $(modconfig_DATA) $(schemafiles_DATA) include $(top_srcdir)/Makefile.am.common Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?rev=67853&r1=67852&r2=67853&view=diff ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Tue Apr 3 14:57:41 2012 @@ -39,7 +39,7 @@ # the server is ready for requests using this function # --- server_running=0 - TESTX=/usr/sbin/testX + TESTX=/usr/lib/YaST2/bin/testX while kill -0 $xserver_pid 2>/dev/null ; do sleep 1 if test -e /tmp/.X11-unix/X0 && test -x $TESTX ; then @@ -51,13 +51,6 @@ server_running=0 continue fi - # exit code 2 -> color or dimensions doesn't fit... - if test $err = 2;then - log "\tTestX: color or dimensions doesn't fit" - kill $xserver_pid - server_running=0 - break; - fi # server is running, detach oom-killer from it echo -n '-17' > /proc/$xserver_pid/oom_adj server_running=1 @@ -200,7 +193,7 @@ Y2_MODE=ncurses fi else - /usr/sbin/testX --fast 2>/dev/null + /usr/lib/YaST2/bin/testX --fast 2>/dev/null if test $? = 1;then log "\tCannot access Display: $DISPLAY, falling back to ncurses" SELECTED_MEDIUM="NCURSES" @@ -501,7 +494,7 @@ fi # 3.1.8) Check for testX binary -if [ ! -x /usr/sbin/testX ] ; then +if [ ! -x /usr/lib/YaST2/bin/testX ] ; then log "\tNo testX binary installed -> Medium Qt and Gtk disabled" MEDIUM[0]=0 MEDIUM[4]=0 @@ -532,7 +525,7 @@ MEDIUM[2]=0 fi # 3.3.3) Check for testX binary -if [ ! -x /usr/sbin/testX ] ; then +if [ ! -x /usr/lib/YaST2/bin/testX ] ; then log "\tNo testX binary installed -> Medium VNC disabled" MEDIUM[2]=0 fi Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=67853&r1=67852&r2=67853&view=diff ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Tue Apr 3 14:57:41 2012 @@ -191,9 +191,6 @@ # programs and scripts @ystartupdir@/startup -# icewm -/etc/icewm - %dir @docdir@ @docdir@/COPYING %readme @docdir@/README -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org