January 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r43949 - /trunk/installation/startup/common/language.sh
by aschnell＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: aschnell Date: Mon Jan 28 15:16:13 2008 New Revision: 43949 URL: http://svn.opensuse.org/viewcvs/yast?rev=43949&view=rev Log: - whitespace cleanup for testing purpose Modified: trunk/installation/startup/common/language.sh Modified: trunk/installation/startup/common/language.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/common/lang… ============================================================================== --- trunk/installation/startup/common/language.sh (original) +++ trunk/installation/startup/common/language.sh Mon Jan 28 15:16:13 2008 @@ -4,7 +4,7 @@ # PROJECT : YaST (Yet another Setup Tool v2) # COPYRIGHT : (c) 2004 SUSE Linux AG, Germany. All rights reserved # : -# AUTHORS : Marcus Schaefer <ms(a)suse.de> +# AUTHORS : Marcus Schaefer <ms(a)suse.de> # : # : # BELONGS TO : System installation and Administration @@ -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 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43948 - in /trunk/installation/startup/common: arch.sh functions.sh logging.sh network.sh stage.sh
by aschnell＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: aschnell Date: Mon Jan 28 15:12:56 2008 New Revision: 43948 URL: http://svn.opensuse.org/viewcvs/yast?rev=43948&view=rev Log: - removed mime-type Modified: trunk/installation/startup/common/arch.sh (props changed) trunk/installation/startup/common/functions.sh (props changed) trunk/installation/startup/common/logging.sh (props changed) trunk/installation/startup/common/network.sh (props changed) trunk/installation/startup/common/stage.sh (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43947 - /trunk/yast2/library/wizard/src/Wizard.ycp
by locilka＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: locilka Date: Mon Jan 28 15:12:19 2008 New Revision: 43947 URL: http://svn.opensuse.org/viewcvs/yast?rev=43947&view=rev Log: Better error handling in Wizard module Modified: trunk/yast2/library/wizard/src/Wizard.ycp Modified: trunk/yast2/library/wizard/src/Wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Wizard.… ============================================================================== --- trunk/yast2/library/wizard/src/Wizard.ycp (original) +++ trunk/yast2/library/wizard/src/Wizard.ycp Mon Jan 28 15:12:19 2008 @@ -1081,7 +1081,11 @@ { if ( UI::WizardCommand(`ShowReleaseNotesButton( label, id ) ) == false ) { - UI::ReplaceWidget (`id (`back_rep), `PushButton (`id (id), label)); + if (UI::WidgetExists (`id (`back_rep))) { + UI::ReplaceWidget (`id (`back_rep), `PushButton (`id (id), label)); + } else { + y2error ("Widget `back_rep does not exist"); + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43946 - /trunk/installation/startup/common/language.sh
by aschnell＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: aschnell Date: Mon Jan 28 15:03:44 2008 New Revision: 43946 URL: http://svn.opensuse.org/viewcvs/yast?rev=43946&view=rev Log: - removed mime-type Modified: trunk/installation/startup/common/language.sh (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43945 - /tags/stable-2_16_7/printer/
by mzugec＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: mzugec Date: Mon Jan 28 14:39:18 2008 New Revision: 43945 URL: http://svn.opensuse.org/viewcvs/yast?rev=43945&view=rev Log: Created tag stable-2_16_7 for printer Added: tags/stable-2_16_7/printer/ - copied from r43944, trunk/printer/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43944 - in /trunk/installation: package/yast2-installation.changes startup/YaST2.call
by aschnell＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: aschnell Date: Mon Jan 28 14:39:01 2008 New Revision: 43944 URL: http://svn.opensuse.org/viewcvs/yast?rev=43944&view=rev Log: - hack for key-autorepeat during installation (bnc #346186) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Jan 28 14:39:01 2008 @@ -2,6 +2,7 @@ Mon Jan 28 13:00:19 CET 2008 - aschnell(a)suse.de - support Qt and Gtk frontend in startup scripts +- hack for key-autorepeat during installation (bnc #346186) - 2.16.11 ------------------------------------------------------------------- Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Mon Jan 28 14:39:01 2008 @@ -60,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 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43943 - in /trunk/printer: ./ package/ src/common/ src/modules/ tools/
by mzugec＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: mzugec Date: Mon Jan 28 14:38:58 2008 New Revision: 43943 URL: http://svn.opensuse.org/viewcvs/yast?rev=43943&view=rev Log: dropped strict requires to netcat (#264309) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/common/dialogs-connection.ycp trunk/printer/src/common/dialogs.ycp trunk/printer/src/modules/CUPS.ycp trunk/printer/src/modules/Printer.ycp trunk/printer/tools/listen_remote_ipp trunk/printer/tools/test_remote_ipp trunk/printer/tools/test_remote_lpd trunk/printer/tools/test_remote_novell trunk/printer/tools/test_remote_smb trunk/printer/tools/test_remote_socket trunk/printer/yast2-printer.spec.in Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=43943&r1=439… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Mon Jan 28 14:38:58 2008 @@ -1 +1 @@ -2.16.6 +2.16.7 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Mon Jan 28 14:38:58 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 28 14:23:51 CET 2008 - mzugec(a)suse.de + +- dropped strict requires to netcat (#264309) +- 2.16.7 + +------------------------------------------------------------------- Mon Nov 26 15:28:07 CET 2007 - mzugec(a)suse.cz - accepting password with "@" in it (#225240) Modified: trunk/printer/src/common/dialogs-connection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs-conne… ============================================================================== --- trunk/printer/src/common/dialogs-connection.ycp (original) +++ trunk/printer/src/common/dialogs-connection.ycp Mon Jan 28 14:38:58 2008 @@ -978,27 +978,8 @@ // label string hent_str = _("&Hostname of Print Server"); term uspas = `VSpacing (0.2); -/* - integer i = findlastof (uri, "/"); - if (nil != i) - { - queue = Printerlib::getUriRemoteQueue (uri); - full_hostname = Printerlib::getUriHost (uri); - hostname = Printerlib::getReplacedString( Printerlib::getUriHost (uri), true ); - list tmp_list = splitstring(hostname, "@"); - if (size(tmp_list)==2){ - hostname = tmp_list[1]:""; - } - } -*/ if (has_user_password) { -/* - list l = Printerlib::getUriUsernamePassWorkgroup ( Printerlib::getReplacedString(uri, true) ); - user = l[0]:""; - password = l[1]:""; - workgroup = l[2]:""; -*/ uspas = `VSquash (`VBox ( // text entry label `TextEntry (`id (`userent), _("&Username"), user), @@ -1018,7 +999,7 @@ queue); term workgroup_entry = `VSpacing (0); // menu button - term lookup_hosts = `MenuButton (_("&Look Up"), [ + term lookup_hosts = `MenuButton (`id(`lookup), _("&Look Up"), [ // menuentry `item (`id (`get_hosts_special), _("Scan for &LPD Servers")), // menuentry @@ -1073,7 +1054,7 @@ // push button _("L&ook Up"))); // menu button - lookup_hosts = `MenuButton (_("&Look Up"), [ + lookup_hosts = `MenuButton (`id(`lookup), _("&Look Up"), [ // menu item `item (`id (`get_hosts_special), _("Scan for &IPP Servers")), // menu item @@ -1094,7 +1075,7 @@ // text entry label _("&TCP Port Number"), sformat("%1", port))); // menu button - lookup_hosts = `MenuButton (_("&Look Up"), [ + lookup_hosts = `MenuButton (`id(`lookup), _("&Look Up"), [ // menu item `item (`id (`get_hosts_special), _("Scan for &Direct Socket Servers")), // menu item @@ -1152,6 +1133,12 @@ else UI::ChangeWidget (`id (`port), `ValidChars, "1234567890"); UI::ChangeWidget (`id (`hostnameent), `Value, hostname); + if (UI::WidgetExists(`test)) UI::ChangeWidget(`test, `Enabled, CUPS::enable_netcat); + if (UI::WidgetExists(`get_hosts_special)) UI::ChangeWidget(`get_hosts_special, `Enabled, CUPS::enable_netcat); + if (UI::WidgetExists(`get_hosts)) UI::ChangeWidget(`get_hosts, `Enabled, CUPS::enable_netcat); + if (UI::WidgetExists(`lookup)) UI::ChangeWidget(`lookup, `Enabled, CUPS::enable_netcat); + if (UI::WidgetExists(`get_printers)) UI::ChangeWidget(`get_printers, `Enabled, CUPS::enable_netcat); + symbol ret = nil; repeat { ret = (symbol)UI::UserInput (); Modified: trunk/printer/src/common/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs.ycp?r… ============================================================================== --- trunk/printer/src/common/dialogs.ycp (original) +++ trunk/printer/src/common/dialogs.ycp Mon Jan 28 14:38:58 2008 @@ -2271,14 +2271,14 @@ UI::ChangeWidget(`select_addr, `Enabled, listen && local); UI::ChangeWidget(`server_name, `Enabled, !local); - UI::ChangeWidget(`lookup_server, `Enabled, !local); - UI::ChangeWidget(`test_ipp, `Enabled, !local); + UI::ChangeWidget(`lookup_server, `Enabled, !local && CUPS::enable_netcat); + UI::ChangeWidget(`test_ipp, `Enabled, !local && CUPS::enable_netcat); UI::ChangeWidget(`use_default, `Enabled, !local); boolean use_def=false; if (!local) use_def=!(boolean) UI::QueryWidget(`use_default, `Value); UI::ChangeWidget(`queues, `Enabled, use_def); - UI::ChangeWidget(`lookup_queue, `Enabled, use_def); + UI::ChangeWidget(`lookup_queue, `Enabled, use_def && CUPS::enable_netcat); if (event["EventReason"]:""=="Activated" && event["ID"]:`nil==`select_addr) { CUPS::cups_server_settings["BrowseAddress"] = getAddresses(CUPS::cups_server_settings["BrowseAddress"]:[]); } Modified: trunk/printer/src/modules/CUPS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/CUPS.ycp?rev… ============================================================================== --- trunk/printer/src/modules/CUPS.ycp (original) +++ trunk/printer/src/modules/CUPS.ycp Mon Jan 28 14:38:58 2008 @@ -39,6 +39,9 @@ // global variables +// in UI enable/disable +global boolean enable_netcat = true; + /** * List of detected CUPS servers */ Modified: trunk/printer/src/modules/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printer.ycp?… ============================================================================== --- trunk/printer/src/modules/Printer.ycp (original) +++ trunk/printer/src/modules/Printer.ycp Mon Jan 28 14:38:58 2008 @@ -45,7 +45,7 @@ import "URL"; import "PackageSystem"; import "URL"; - + import "PackageSystem"; ////////// ////////// Module data @@ -1209,6 +1209,7 @@ if (testAbort ()) return false; Printerlib::readHplip(); + CUPS::enable_netcat = PackageSystem::Installed("netcat"); if (! checkSpooler ()) return false; Modified: trunk/printer/tools/listen_remote_ipp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/listen_remote_ipp?… ============================================================================== --- trunk/printer/tools/listen_remote_ipp (original) +++ trunk/printer/tools/listen_remote_ipp Mon Jan 28 14:38:58 2008 @@ -3,11 +3,32 @@ # Listen on UDP port 631 for incoming CUPS network server broadcasts # and if so extract the CUPS network server name # -# Exits: 0 doesn't seem to have a problem -# 1 local UDP port 631 not available (perhaps cupsd is running?) -# 2 cannot create temporary file - -set -x +# Exits: 0 doesn't seem to have a problem +# 1 local UDP port 631 not available (perhaps cupsd is running?) +# 2 cannot create temporary file +# 11 netcat not executable (no netcat RPM installed?) +# 12 fuser not executable (no psmisc RPM installed?) +# 13 mktemp not executable (no mktemp RPM installed?) +# 14 sed not executable (no sed RPM installed?) +# The programs head, rm, sleep, sort are in the coreutils RPM and therefore assumed to exist. + +#set -x + +# Make sure to have a clean environment: +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +# Use the binaries of the operating system (no aliases, functions, /usr/local/): +export NETCAT=$( type -ap netcat | head -n 1 ) +[ -z "$NETCAT" ] && { echo -en "\nnetcat not executable\n" 1>&2 ; exit 11 ; } +export FUSER=$( type -ap fuser | head -n 1 ) +[ -z "$FUSER" ] && { echo -en "\nfuser not executable\n" 1>&2 ; exit 12 ; } +export MKTEMP=$( type -ap mktemp | head -n 1 ) +[ -z "$MKTEMP" ] && { echo -en "\nmktemp not executable\n" 1>&2 ; exit 13 ; } +export SED=$( type -ap sed | head -n 1 ) +[ -z "$SED" ] && { echo -en "\nsed not executable\n" 1>&2 ; exit 14 ; } YAST_OUTPUT="/var/lib/YaST2/cups_network_server_name" # The minimum timeout is 31 seconds because by default a @@ -34,13 +55,13 @@ [ -z "$ADDITIONAL_TIMEOUT" ] && ADDITIONAL_TIMEOUT=1 # Test whether local UDP port 631 is not available for connecting -fuser -n udp 631 &>/dev/null && exit 1 +$FUSER -n udp 631 &>/dev/null && { echo -en "\nUDP port 631 already in use\n" 1>&2 ; exit 1 ; } # Create temporary file -OUTPUT=$(mktemp -u /tmp/$MY_NAME.XXXXXX) || exit 2 +OUTPUT=$( $MKTEMP -u /tmp/$MY_NAME.XXXXXX ) || { echo -en "\nCannot create temporary file\n" 1>&2 ; exit 2 ; } # Listen on UDP port 631 for CUPS network server packages -netcat -u -l -p 631 1>$OUTPUT 2>/dev/null & +$NETCAT -u -l -p 631 1>$OUTPUT 2>/dev/null & NETCAT_PID=$! # sleep is not interrupted by signals (except SIGKILL) @@ -52,11 +73,11 @@ # then "wait $!" would be interrupted [ -z "$SIGHUP_RECEIVED" ] && sleep $ADDITIONAL_TIMEOUT & wait $! -# as "netcat -w" does not work together with "-u" we send SIGTERM -kill $NETCAT_PID &>/dev/null - -# extract the CUPS network server name from the output -# and store it to be available for YaST -sed -n -e 's/^.*ipp:\/\/$.*$:.*$/\1/p' $OUTPUT 1>$YAST_OUTPUT +# as "netcat -w" does not work together with "-u" we send SIGKILL +kill -9 $NETCAT_PID &>/dev/null +# extract the CUPS network server names from the output +# and store them to be available for YaST +$SED -n -e 's/^.*ipp:\/\/$.*$:.*$/\1/p' $OUTPUT | sort -u 1>$YAST_OUTPUT exit 0 + Modified: trunk/printer/tools/test_remote_ipp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_ipp?re… ============================================================================== --- trunk/printer/tools/test_remote_ipp (original) +++ trunk/printer/tools/test_remote_ipp Mon Jan 28 14:38:58 2008 @@ -7,13 +7,33 @@ # 2 the remote host $1 is unreachable # 3 no connection possible to port 631 on host $1 (no cups server running ?) # 4 queue does not accept a print job (queue does not exist or queueing disabled ?) +# 10 ping not executable (no iputils RPM installed?) +# 11 netcat not executable (no netcat RPM installed?) +# (12=fuser,13=mktemp,14=sed: see listen_remote_ipp) +# 15 lp not executable (no cups-client RPM installed?) +# The program head is in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id$ #set -x + +# Make sure to have a clean environment: +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +# Use the binaries of the operating system (no aliases, functions, /usr/local/): +export PING=$( type -ap ping | head -n 1 ) +[ -z "$PING" ] && { echo -en "\nping not executable\n" 1>&2 ; exit 10 ; } +export NETCAT=$( type -ap netcat | head -n 1 ) +[ -z "$NETCAT" ] && { echo -en "\nnetcat not executable\n" 1>&2 ; exit 11 ; } +export LP=$( type -ap lp | head -n 1 ) +[ -z "$LP" ] && { echo -en "\nlp not executable\n" 1>&2 ; exit 15 ; } + MY_NAME=${0##*/} HOST="$1" QUEUE="$2" @@ -22,20 +42,14 @@ [ -z "$TIMEOUT" ] && TIMEOUT=10 # test whether the remote host is accessible -ping -c 1 -w $TIMEOUT $HOST || { echo -en "\nHost $HOST unreachable\n" ; exit 2 ; } +$PING -c 1 -w $TIMEOUT $HOST || { echo -en "\nHost $HOST unreachable\n" ; exit 2 ; } # test whether connection is possible to port 631 (ipp) on the remote host -netcat -w $TIMEOUT -z $HOST 631 || { echo -en "\nNo connection possible to port 635 (ipp)\n" ; exit 3 ; } - -# test the queue and server -echo -en "\r" | lp -d $QUEUE -h $HOST 2>&1; - -RES=$? +$NETCAT -w $TIMEOUT -z $HOST 631 || { echo -en "\nNo connection possible to port 635 (IPP) on host $HOST\n" ; exit 3 ; } -if [ $RES -eq 0 ]; - then - exit 0; -else - exit 4; -fi +# test whether the queue on the server accepts print jobs +echo -en "\r" | $LP -d $QUEUE -h $HOST 2>&1 +[ "$?" = "0" ] && { echo -en "\nQueue $QUEUE on host $HOST accepts print jobs\n" ; exit 0 ; } +echo -en "\nQueue $QUEUE on host $HOST does not accept print jobs\n" +exit 4 Modified: trunk/printer/tools/test_remote_lpd URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_lpd?re… ============================================================================== --- trunk/printer/tools/test_remote_lpd (original) +++ trunk/printer/tools/test_remote_lpd Mon Jan 28 14:38:58 2008 @@ -10,13 +10,35 @@ # 2 the remote host $1 is unreachable # 3 no connection possible to port 515 on host $1 (no lpd running ?) # 4 queue does not accept a print job (queue does not exist or queueing disabled ?) +# 10 ping not executable (no iputils RPM installed?) +# 11 netcat not executable (no netcat RPM installed?) +# 12 fuser not executable (no psmisc RPM installed?) +# 13 mktemp not executable (no mktemp RPM installed?) +# The programs head, mkfifo, sleep, tr, rm are in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id$ #set -x + +# Make sure to have a clean environment: +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +# Use the binaries of the operating system (no aliases, functions, /usr/local/): +export PING=$( type -ap ping | head -n 1 ) +[ -z "$PING" ] && { echo -en "\nping not executable\n" 1>&2 ; exit 10 ; } +export NETCAT=$( type -ap netcat | head -n 1 ) +[ -z "$NETCAT" ] && { echo -en "\nnetcat not executable\n" 1>&2 ; exit 11 ; } +export FUSER=$( type -ap fuser | head -n 1 ) +[ -z "$FUSER" ] && { echo -en "\nfuser not executable\n" 1>&2 ; exit 12 ; } +export MKTEMP=$( type -ap mktemp | head -n 1 ) +[ -z "$MKTEMP" ] && { echo -en "\nmktemp not executable\n" 1>&2 ; exit 13 ; } + MY_NAME=${0##*/} HOST="$1" QUEUE="$2" @@ -25,25 +47,25 @@ [ -z "$TIMEOUT" ] && TIMEOUT=10 # test whether the remote host is accessible -ping -c 1 -w $TIMEOUT $HOST || { echo -en "\nHost $HOST unreachable\n" ; exit 2 ; } +$PING -c 1 -w $TIMEOUT $HOST || { echo -en "\nHost $HOST unreachable\n" ; exit 2 ; } # test whether connection is possible to port 515 (lpd) on the remote host -netcat -w $TIMEOUT -z $HOST 515 || { echo -en "\nNo connection possible to port 515 (lpd)\n" ; exit 3 ; } +$NETCAT -w $TIMEOUT -z $HOST 515 || { echo -en "\nNo connection possible to port 515 (lpd)\n" ; exit 3 ; } # Find an available local port for connecting PORT=$(for I in 721 722 723 724 725 726 727 728 729 730 731 do - fuser -n tcp $I &>/dev/null || { echo $I ; break ; } + $FUSER -n tcp $I &>/dev/null || { echo $I ; break ; } done) # Create temporary fifos -TMP_IN=$(mktemp -u /tmp/$MY_NAME.in.XXXXXX) -TMP_OUT=$(mktemp -u /tmp/$MY_NAME.out.XXXXXX) +TMP_IN=$( $MKTEMP -u /tmp/$MY_NAME.in.XXXXXX ) +TMP_OUT=$( $MKTEMP -u /tmp/$MY_NAME.out.XXXXXX) mkfifo $TMP_IN mkfifo $TMP_OUT # Test the queue: -# Use source port $PORT and destination port 515 (lpd) +# Use source port $PORT and destination port 515 (LPD) # "\002$QUEUE\n" is a request to receive a new job for $QUEUE # The remote lpd sends '\000' if it accepts the request. Then we must # send "\001\n" back which is a request to cancel the new job. @@ -52,26 +74,25 @@ # But as there may be no response from the remote port we have additionally # a time bomb which would kill the netcat process after $TIMEOUT. -netcat -w $TIMEOUT -p $PORT $HOST 515 <$TMP_IN >$TMP_OUT 2>/dev/null & +$NETCAT -w $TIMEOUT -p $PORT $HOST 515 <$TMP_IN >$TMP_OUT 2>/dev/null & NETCAT_PID=$! { sleep ${TIMEOUT}s ; kill $NETCAT_PID &>/dev/null ; } & RESULT="" { echo -en "\002$QUEUE\n" ; \ - RESULT=$(head --bytes=1 <$TMP_OUT | tr '\000' '0') ; \ + RESULT=$( head --bytes=1 <$TMP_OUT | tr '\000' '0' ) ; \ [ "$RESULT" = "0" ] && echo -en "\001\n" ; } >$TMP_IN rm $TMP_IN rm $TMP_OUT -[ "$RESULT" = "0" ] \ - && { echo -en "\nQueue $QUEUE on host $HOST accepts print jobs\n" ; exit 0 ; } \ - || echo -en "\nQueue $QUEUE on host $HOST does not accept print jobs\n" +[ "$RESULT" = "0" ] && { echo -en "\nQueue $QUEUE on host $HOST accepts print jobs\n" ; exit 0 ; } + +echo -en "\nQueue $QUEUE on host $HOST does not accept print jobs\n" # If $QUEUE does not accept jobs, print $QUEUE status in long format. # "\004$QUEUE\n" is a request to receive $QUEUE status (very long output in case of LPRng). - echo -en "\nStatus of the queue $QUEUE\n" -echo -en "\004$QUEUE\n" | netcat -w $TIMEOUT -p $PORT $HOST 515 +echo -en "\004$QUEUE\n" | $NETCAT -w $TIMEOUT -p $PORT $HOST 515 exit 4 Modified: trunk/printer/tools/test_remote_novell URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_novell… ============================================================================== --- trunk/printer/tools/test_remote_novell (original) +++ trunk/printer/tools/test_remote_novell Mon Jan 28 14:38:58 2008 @@ -5,13 +5,26 @@ # Exits: 0 doesn't seem to have a problem # 1 remote host $1 or queue $2 not set # 4 queue does not accept a print job (queue does not exist or queueing disabled ?) +# (10=ping,11=netcat,12=fuser,13=mktemp,14=sed,15=lp,16=smbclient: see test_remote_smb) +# 17 nprint not executable (no ncpfs RPM installed?) # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id$ #set -x + +# Make sure to have a clean environment: +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +# Use the binaries of the operating system (no aliases, functions, /usr/local/): +export NPRINT=$( type -ap nprint | head -n 1 ) +[ -z "$NPRINT" ] && { echo -en "\nnprint not executable\n" 1>&2 ; exit 17 ; } + MY_NAME=${0##*/} HOST=$1 QUEUE=$2 @@ -22,15 +35,9 @@ [ -z "$TIMEOUT" ] && TIMEOUT=10 -# test the queue and server -echo -en "\r" | nprint -S "$HOST" -U "$USER" -P "$PASSWORD" -q "$QUEUE" - 2>&1 - -RES=$? - -if [ $RES -eq 0 ]; - then - exit 0; -else - exit 4; -fi +# test whether the queue on the server accepts print jobs +echo -en "\r" | $NPRINT -S "$HOST" -U "$USER" -P "$PASSWORD" -q "$QUEUE" - 2>&1 +[ "$?" = "0" ] && { echo -en "\nQueue $QUEUE on host $HOST accepts print jobs\n" ; exit 0 ; } +echo -en "\nQueue $QUEUE on host $HOST does not accept print jobs\n" +exit 4 Modified: trunk/printer/tools/test_remote_smb URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_smb?re… ============================================================================== --- trunk/printer/tools/test_remote_smb (original) +++ trunk/printer/tools/test_remote_smb Mon Jan 28 14:38:58 2008 @@ -7,13 +7,30 @@ # 2 the remote host $1 is unreachable # 3 no connection possible to port 631 on host $1 (no cups server running ?) # 4 queue does not accept a print job (queue does not exist or queueing disabled ?) +# 10 ping not executable (no iputils RPM installed?) +# (11=netcat,12=fuser,13=mktemp,14=sed,15=lp: see test_remote_ipp) +# 16 smbclient not executable (no samba-client RPM installed?) +# The programs head, mkfifo, sleep, tr, rm are in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002 +# Johannes Meixner <jsmeix(a)suse.de>, 2000, 2002, 2007 # Jan Holesovsky <kendy(a)suse.cz>, 2000 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id$ #set -x + +# Make sure to have a clean environment: +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +# Use the binaries of the operating system (no aliases, functions, /usr/local/): +export PING=$( type -ap ping | head -n 1 ) +[ -z "$PING" ] && { echo -en "\nping not executable\n" 1>&2 ; exit 10 ; } +export SMBCLIENT=$( type -ap smbclient | head -n 1 ) +[ -z "$SMBCLIENT" ] && { echo -en "\nsmbclient not executable\n" 1>&2 ; exit 16 ; } + MY_NAME=${0##*/} WORKGROUP=$1 HOST=$2 @@ -26,19 +43,13 @@ [ -z "$TIMEOUT" ] && TIMEOUT=10 # test whether the remote host is accessible -ping -c 1 -w $TIMEOUT $HOST || { echo -en "\nHost $HOST unreachable\n" ; exit 2 ; } +$PING -c 1 -w $TIMEOUT $HOST || { echo -en "\nHost $HOST unreachable\n" ; exit 2 ; } -# test the queue and server -echo -e "\nTesting $QUEUE on $WORKGROUP $HOST:" +# test whether the queue on the server accepts print jobs +echo -e "\nTesting $QUEUE on $WORKGROUP/$HOST:" test -z $PASSWORD && PASSWORD="-N" -echo -en "\r" | smbclient "//$HOST/$QUEUE" "$PASSWORD" -c "print -" -U "$USER" -W "$WORKGROUP" - -RES=$? - -if [ $RES -eq 0 ]; - then - exit 0; -else - exit 4; -fi +echo -en "\r" | $SMBCLIENT "//$HOST/$QUEUE" "$PASSWORD" -c "print -" -U "$USER" -W "$WORKGROUP" +[ "$?" = "0" ] && { echo -en "\nShare $QUEUE on $WORKGROUP/$HOST accepts print jobs\n" ; exit 0 ; } +echo -en "\nShare $QUEUE on $WORKGROUP/$HOST does not accept print jobs\n" +exit 4 Modified: trunk/printer/tools/test_remote_socket URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/test_remote_socket… ============================================================================== --- trunk/printer/tools/test_remote_socket (original) +++ trunk/printer/tools/test_remote_socket Mon Jan 28 14:38:58 2008 @@ -7,12 +7,28 @@ # 2 the remote host $1 is unreachable # 3 no connection possible to port 9100 or port $2 on host $1 # 4 port 9100 or port $2 on host $1 does not accept data +# 10 ping not executable (no iputils RPM installed?) +# 11 netcat not executable (no netcat RPM installed?) +# The program head is in the coreutils RPM and therefore assumed to exist. # -# Johannes Meixner <jsmeix(a)suse.de> 2002 +# Johannes Meixner <jsmeix(a)suse.de> 2002, 2007 # Jiri Srain <jsrain(a)suse.cz>, 2002 # $Id$ #set -x + +# Make sure to have a clean environment: +export PATH="/sbin:/usr/sbin:/usr/bin:/bin" +export LC_ALL="POSIX" +export LANG="POSIX" +umask 022 + +# Use the binaries of the operating system (no aliases, functions, /usr/local/): +export PING=$( type -ap ping | head -n 1 ) +[ -z "$PING" ] && { echo -en "\nping not executable\n" 1>&2 ; exit 10 ; } +export NETCAT=$( type -ap netcat | head -n 1 ) +[ -z "$NETCAT" ] && { echo -en "\nnetcat not executable\n" 1>&2 ; exit 11 ; } + MY_NAME=${0##*/} HOST="$1" [ -z "$HOST" ] && { echo -en "\nUsage:\n$MY_NAME HOST [PORT [TIMEOUT]]\n" 1>&2 ; exit 1 ; } @@ -22,16 +38,14 @@ [ -z "$TIMEOUT" ] && TIMEOUT=10 # test whether the remote host is accessible -ping -c 1 -w $TIMEOUT $HOST || { echo -en "\nHost $HOST unreachable\n" ; exit 2 ; } +$PING -c 1 -w $TIMEOUT $HOST || { echo -en "\nHost $HOST unreachable\n" ; exit 2 ; } # test whether connection is possible to $PORT on the remote host -netcat -w $TIMEOUT -z $HOST $PORT || { echo -en "\nNo connection possible to port $PORT\n" ; exit 3 ; } +$NETCAT -w $TIMEOUT -z $HOST $PORT || { echo -en "\nNo connection possible to port $PORT\n" ; exit 3 ; } # test whether $PORT on the remote host accepts data -echo -en "\r" | netcat -w $TIMEOUT $HOST $PORT 2>&1 -RESULT=$? -[ "$RESULT" = "0" ] \ - && { echo -en "\nPort $PORT on host $HOST accepts data\n" ; exit 0 ; } \ - || echo -en "\nPort $PORT on host $HOST does not accept data\n" +echo -en "\r" | $NETCAT -w $TIMEOUT $HOST $PORT 2>&1 +[ "$?" = "0" ] && { echo -en "\nPort $PORT on host $HOST accepts data\n" ; exit 0 ; } +echo -en "\nPort $PORT on host $HOST does not accept data\n" exit 4 Modified: trunk/printer/yast2-printer.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/yast2-printer.spec.in?re… ============================================================================== --- trunk/printer/yast2-printer.spec.in (original) +++ trunk/printer/yast2-printer.spec.in Mon Jan 28 14:38:58 2008 @@ -3,7 +3,8 @@ @HEADER@ BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp gcc-c++ libxcrypt-devel openssl-devel docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-core-devel zlib-devel -Requires: netcat zlib blocxx +Requires: zlib blocxx +Recommends: netcat Requires: /usr/bin/host cups-libs Requires: yast2 >= 2.16.12 #Requires: cups >= 1.2 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43942 - in /trunk/yast2: library/control/src/ProductControl.ycp package/yast2.changes
by locilka＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: locilka Date: Mon Jan 28 13:16:51 2008 New Revision: 43942 URL: http://svn.opensuse.org/viewcvs/yast?rev=43942&view=rev Log: - Removing useless Wizard() calls in ProductControl to minimize the Wizard redrawing. Modified: trunk/yast2/library/control/src/ProductControl.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/control/src/ProductControl.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Produc… ============================================================================== --- trunk/yast2/library/control/src/ProductControl.ycp (original) +++ trunk/yast2/library/control/src/ProductControl.ycp Mon Jan 28 13:16:51 2008 @@ -536,7 +536,6 @@ }); UI::WizardCommand(`SetCurrentStep( first_id ) ); - return; } @@ -551,8 +550,9 @@ UI::WizardCommand(`DeleteSteps()); AddWizardSteps( stagemode ); - UI::WizardCommand(`UpdateSteps()); - UI::WizardCommand(`SetCurrentStep( CurrentWizardStep ) ); + // AddWizardSteps sets the current step itself (which also updates the Wizard) + // UI::WizardCommand(`SetCurrentStep( CurrentWizardStep ) ); + // UI::WizardCommand(`UpdateSteps()); return; } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Jan 28 13:16:51 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 28 13:14:13 CET 2008 - locilka(a)suse.cz + +- Removing useless Wizard() calls in ProductControl to minimize the + Wizard redrawing. + +------------------------------------------------------------------- Mon Jan 28 13:00:19 CET 2008 - aschnell(a)suse.de - support Qt and Gtk frontend in startup scripts -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43941 - /trunk/installation/src/clients/inst_complex_welcome.ycp
by locilka＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: locilka Date: Mon Jan 28 13:11:25 2008 New Revision: 43941 URL: http://svn.opensuse.org/viewcvs/yast?rev=43941&view=rev Log: Enabling Abort button Modified: trunk/installation/src/clients/inst_complex_welcome.ycp Modified: trunk/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_co… ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Mon Jan 28 13:11:25 2008 @@ -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); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r43940 - in /trunk: installation/ installation/package/ installation/startup/ yast2/ yast2/package/ yast2/scripts/
by aschnell＠svn.opensuse.org 28 Jan '08

28 Jan '08

Author: aschnell Date: Mon Jan 28 13:05:29 2008 New Revision: 43940 URL: http://svn.opensuse.org/viewcvs/yast?rev=43940&view=rev Log: - support Qt and Gtk frontend in startup scripts Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call trunk/yast2/VERSION trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2 trunk/yast2/scripts/yast2-funcs Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=43940&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Jan 28 13:05:29 2008 @@ -1 +1 @@ -2.16.10 +2.16.11 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Jan 28 13:05:29 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 28 13:00:19 CET 2008 - aschnell(a)suse.de + +- support Qt and Gtk frontend in startup scripts +- 2.16.11 + +------------------------------------------------------------------- Fri Jan 25 13:35:13 CET 2008 - locilka(a)suse.cz - Reduced Wizard redrawing in the installation workflow. Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Mon Jan 28 13:05:29 2008 @@ -16,12 +16,11 @@ # : 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$ #---------------- # @@ -100,12 +99,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 +180,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 +234,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 +267,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 +283,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 +364,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 +412,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 +641,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 +669,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 +681,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 +697,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 +715,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 +812,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 +850,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 +860,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 +900,3 @@ #--------------------------------------------- exit $Y2_EXIT_CODE - Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=43940&r1=43939… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Mon Jan 28 13:05:29 2008 @@ -1 +1 @@ -2.16.23 +2.16.24 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Jan 28 13:05:29 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 28 13:00:19 CET 2008 - aschnell(a)suse.de + +- support Qt and Gtk frontend in startup scripts +- 2.16.24 + +------------------------------------------------------------------- Mon Jan 28 16:28:34 CET 2008 - locilka(a)suse.cz - Adjusted SCR agent for SuSEfirewall2 sysconfig file. Values can @@ -46,7 +52,7 @@ ------------------------------------------------------------------- Fri Jan 18 18:04:57 CET 2008 - kmachalkova(a)suse.cz -- Re-enabled threading in ncurses UI (bug #164999, FaTE #301899) +- Re-enabled threading in ncurses UI (bug #164999, FaTE #301899) ------------------------------------------------------------------- Thu Jan 17 13:15:45 CET 2008 - lslezak(a)suse.cz @@ -59,13 +65,13 @@ ------------------------------------------------------------------- Fri Jan 11 14:11:16 CET 2008 - mzugec(a)suse.de -- remove ocurrences of deprecated NetworkInterfaces::device_name +- remove ocurrences of deprecated NetworkInterfaces::device_name ------------------------------------------------------------------- Tue Jan 8 17:20:27 CET 2008 - mzugec(a)suse.cz - added NetworkInterfaces module (NetworkDevices will be deprecated) -- 2.16.20 +- 2.16.20 ------------------------------------------------------------------- Tue Jan 8 13:06:46 CET 2008 - jsrain(a)suse.cz @@ -94,13 +100,13 @@ ------------------------------------------------------------------- Thu Dec 13 17:47:39 CET 2007 - mzugec(a)suse.de -- NetworkDevices::CleanCacheRead() to reset and re-read +- NetworkDevices::CleanCacheRead() to reset and re-read .sysconfig.network.ifcfg* because of network proposal (#170558) -- NetworkDevices::GetDeviceTypes() - list of netcard devices for +- NetworkDevices::GetDeviceTypes() - list of netcard devices for this architecture - NetworkDevices::GetDevTypeDescription() moved from network module (routines/summary device_types, routines/complex device_names) -- 2.16.18 +- 2.16.18 ------------------------------------------------------------------- Mon Dec 10 12:31:44 CET 2007 - locilka(a)suse.cz @@ -137,7 +143,7 @@ ------------------------------------------------------------------- Wed Dec 5 17:32:22 CET 2007 - sh(a)suse.de -- Dropped obsolete --noborder option for /sbin/yast2 +- Dropped obsolete --noborder option for /sbin/yast2 ------------------------------------------------------------------- Mon Dec 3 16:43:50 CET 2007 - locilka(a)suse.cz @@ -166,12 +172,12 @@ Thu Nov 29 13:19:11 CET 2007 - mzugec(a)suse.cz - for AY Confirm::Detection popup has timeout 10 seconds (#192181) -- 2.16.15 +- 2.16.15 ------------------------------------------------------------------- Tue Nov 27 19:13:03 CET 2007 - sh(a)suse.de -- Require yast2-core >= 2.16.10 in .spec +- Require yast2-core >= 2.16.10 in .spec - 2.16.14 ------------------------------------------------------------------- @@ -189,7 +195,7 @@ Fri Nov 23 16:21:28 CET 2007 - mzugec(a)suse.cz - fixed URL module for "smb" type -- 2.16.12 +- 2.16.12 ------------------------------------------------------------------- Thu Nov 22 17:45:45 CET 2007 - locilka(a)suse.cz @@ -236,7 +242,7 @@ Wed Nov 7 20:59:53 CET 2007 - mzugec(a)suse.cz - added new function ListDevicesExcept(string) -- 2.16.9 +- 2.16.9 ------------------------------------------------------------------- Tue Nov 6 18:22:47 CET 2007 - locilka(a)suse.cz @@ -318,7 +324,7 @@ Wed Sep 26 18:06:50 CEST 2007 - kmachalkova(a)suse.cz - Text-mode control center: do not show groups containing no modules - to the user (#309452) + to the user (#309452) ------------------------------------------------------------------- Wed Sep 12 11:24:50 CEST 2007 - jsrain(a)suse.cz @@ -330,7 +336,7 @@ ------------------------------------------------------------------- Tue Sep 11 10:23:08 CEST 2007 - varkoly(a)suse.de -- Fixed Provides list (#309420) +- Fixed Provides list (#309420) ------------------------------------------------------------------- Mon Sep 10 11:41:49 CEST 2007 - locilka(a)suse.cz @@ -405,7 +411,7 @@ ------------------------------------------------------------------- Tue Aug 28 15:54:17 CEST 2007 - mzugec(a)suse.cz -- add filter and log for output of NetworkDevices::List() (#303858) +- add filter and log for output of NetworkDevices::List() (#303858) ------------------------------------------------------------------- Tue Aug 28 12:12:49 CEST 2007 - locilka(a)suse.cz @@ -422,7 +428,7 @@ Fri Aug 24 13:21:57 CEST 2007 - mzugec(a)suse.cz - add "ath" into "netcard" macro in NetworkDevices (#288450) -- 2.15.48 +- 2.15.48 ------------------------------------------------------------------- Sun Aug 12 12:13:36 CEST 2007 - coolo(a)suse.de @@ -476,7 +482,7 @@ Sun Jul 22 10:02:08 CEST 2007 - mzugec(a)suse.de - don't use getcfg in IsConnected function -- 2.15.41 +- 2.15.41 ------------------------------------------------------------------- Wed Jul 18 16:56:45 CEST 2007 - lslezak(a)suse.cz @@ -524,7 +530,7 @@ - Respect user's choice and never unset LANG (yast2-funcs) - Do not append .UTF-8 suffix to POSIX and C locale (/sbin/yast2) - (#285178) + (#285178) - 2.15.37 ------------------------------------------------------------------- @@ -544,14 +550,14 @@ - Enable setting color theme of ncurses UI (Y2NCURSES_COLOR_THEME variable added to sysconfig, exported by /sbin/yast2 if defined) - (FaTE #301893)) + (FaTE #301893)) ------------------------------------------------------------------- Tue Jun 12 18:05:51 CEST 2007 - mzugec(a)suse.cz -- fixed CheckDomain function - allow "." character at the end +- fixed CheckDomain function - allow "." character at the end of domain name (suse.cz.) -- 2.15.36 +- 2.15.36 ------------------------------------------------------------------- Thu Jun 7 10:14:06 CEST 2007 - lslezak(a)suse.cz @@ -572,13 +578,13 @@ - add function NetworkService::isNetworkRunning() - NetworkStorage moved here from yast2-network -- 2.15.35 +- 2.15.35 ------------------------------------------------------------------- Wed May 30 13:48:27 CEST 2007 - sh(a)suse.de - Fixed bug #278790: save_y2logs complains about missing RPM DB - + ------------------------------------------------------------------- Tue May 29 15:53:15 CEST 2007 - lslezak(a)suse.cz @@ -595,7 +601,7 @@ Mon May 21 16:04:31 CEST 2007 - kmachalkova(a)suse.cz - Do not show empty xmessage window if nothing is printed to stderr - after yast module has exited (mvidner's patch for #265263) + after yast module has exited (mvidner's patch for #265263) ------------------------------------------------------------------- Mon May 21 13:39:58 CEST 2007 - jsrain(a)suse.cz @@ -614,7 +620,7 @@ Thu May 17 17:08:57 CEST 2007 - kmachalkova(a)suse.cz - Do not request link state of network devices from ethtool (ask - sysfs instead) so that yast2 does not require ethtool (#256382) + sysfs instead) so that yast2 does not require ethtool (#256382) ------------------------------------------------------------------- Wed May 16 11:52:52 CEST 2007 - locilka(a)suse.cz @@ -653,7 +659,7 @@ - Add new module file MailAlias.ycp (269867 - build cycle between yast2-users and yast2-mail) -- 2.15.31 +- 2.15.31 ------------------------------------------------------------------- Thu May 3 14:20:41 CEST 2007 - locilka(a)suse.cz @@ -665,7 +671,7 @@ Thu Apr 19 16:30:05 CEST 2007 - mzugec(a)suse.cz - added GetIP(device) function to get first+additional addresses (#264393) -- 2.15.30 +- 2.15.30 ------------------------------------------------------------------- Thu Apr 19 11:09:13 CEST 2007 - jsrain(a)suse.cz @@ -729,7 +735,7 @@ Mon Apr 2 14:15:53 CEST 2007 - jsuchome(a)suse.cz - fixed restarting after Patch CD update (#259825) -- 2.15.23 +- 2.15.23 ------------------------------------------------------------------- Mon Apr 2 14:11:12 CEST 2007 - lslezak(a)suse.cz @@ -803,7 +809,7 @@ Mon Mar 12 11:54:18 CET 2007 - mzugec(a)suse.cz - sysconfig/network: use IPADDR/PREFIXLEN as default instead of NETMASK (#231997) -- 2.15.19 +- 2.15.19 ------------------------------------------------------------------- Mon Mar 12 08:42:07 CET 2007 - locilka(a)suse.cz @@ -825,7 +831,7 @@ Thu Mar 8 18:21:35 CET 2007 - jsuchome(a)suse.cz - added SLPAPI.pm, Perl API for SLP agent (#238680) -- 2.15.17 +- 2.15.17 ------------------------------------------------------------------- Thu Mar 8 16:57:17 CET 2007 - locilka(a)suse.cz @@ -882,7 +888,7 @@ Thu Mar 1 17:58:14 CET 2007 - kmachalkova(a)suse.cz - Added checking for root user into ncurses menu. If the user is not - root, show notify popup and list only the modules that do not need + root, show notify popup and list only the modules that do not need root privileges (#246015) ------------------------------------------------------------------- @@ -1003,7 +1009,7 @@ Thu Feb 8 11:06:41 CET 2007 - kmachalkova(a)suse.cz - Use UI::RunInTerminal in menu.ycp for text-mode only. In all other - cases run appropriate module in Qt(Gtk) + cases run appropriate module in Qt(Gtk) - 2.15.5 ------------------------------------------------------------------- @@ -1017,7 +1023,7 @@ Mon Jan 29 16:10:53 CET 2007 - mzugec(a)suse.de - Internet connection test fails on s390 (#238246) -- 2.15.4 +- 2.15.4 ------------------------------------------------------------------- Tue Jan 23 10:03:01 CET 2007 - jsrain(a)suse.cz @@ -1028,7 +1034,7 @@ Mon Jan 22 17:53:17 CET 2007 - mzugec(a)suse.cz - 2.15.3 -- #237353 - use cache to avoid multiple confirmations for the same purpose +- #237353 - use cache to avoid multiple confirmations for the same purpose ------------------------------------------------------------------- Fri Jan 19 10:16:05 CET 2007 - jsuchome(a)suse.cz @@ -1047,12 +1053,12 @@ ------------------------------------------------------------------- Thu Jan 18 15:16:45 CET 2007 - kmachalkova(a)suse.cz -- Avoid displaying empty strings in NetworkPopup (#220813, #223498) +- Avoid displaying empty strings in NetworkPopup (#220813, #223498) ------------------------------------------------------------------- Tue Jan 9 11:23:04 CET 2007 - mzugec(a)suse.cz -- add bond device +- add bond device ------------------------------------------------------------------- Mon Jan 8 18:09:00 CET 2007 - locilka(a)suse.cz @@ -1100,7 +1106,7 @@ ------------------------------------------------------------------- Tue Dec 5 11:20:10 CET 2006 - kmachalkova(a)suse.cz -- Adapt ncurses menu.ycp for running yast modules as separate +- Adapt ncurses menu.ycp for running yast modules as separate processes (#148683, #221254, #222547) - Do not change LANG and LC_CTYPE when stdin does not support utf8 (testutf8 returns 0) (partly #179989) @@ -1124,7 +1130,7 @@ - Better selection of fastest available network device (checking for cable connection and status for NICs) (#214897) -- 2.14.13 +- 2.14.13 ------------------------------------------------------------------- Mon Nov 13 17:26:19 CET 2006 - locilka(a)suse.cz @@ -1153,7 +1159,7 @@ - #177560 - fixed corrupting sysconfig files after setting locale to et_EE - set value to boolean if contains "yes" or "no" -- 2.14.9 +- 2.14.9 ------------------------------------------------------------------- Fri Nov 3 15:37:06 CET 2006 - locilka(a)suse.cz @@ -1275,7 +1281,7 @@ Wed Aug 30 16:31:11 CEST 2006 - sh(a)suse.de - Added output of "rpm -qa" to save_y2logs - upon request at all-hands meeting 2006-08-29 + upon request at all-hands meeting 2006-08-29 - 2.13.79 ------------------------------------------------------------------- @@ -1324,7 +1330,7 @@ ------------------------------------------------------------------- Wed Aug 9 14:19:23 CEST 2006 - kmachalkova(a)suse.cz -- Added new Address::CheckMAC() and Address::ValidMAC() functions. +- Added new Address::CheckMAC() and Address::ValidMAC() functions. - 2.13.73 ------------------------------------------------------------------- @@ -1475,7 +1481,7 @@ - Fixing exporting the $QT_HOME_DIR according to $user's home directory (#162114). -- 2.13.59 +- 2.13.59 ------------------------------------------------------------------- Mon May 15 15:18:56 CEST 2006 - locilka(a)suse.cz @@ -1528,7 +1534,7 @@ Tue Apr 25 14:24:45 CEST 2006 - visnov(a)suse.cz - ensure importing trusted RPM keys before initializing sources (#169121) -- 2.13.53 +- 2.13.53 ------------------------------------------------------------------- Thu Apr 20 22:47:03 CEST 2006 - jsrain(a)suse.de @@ -1558,7 +1564,7 @@ ------------------------------------------------------------------- Fri Apr 14 14:29:17 CEST 2006 - jsuchome(a)suse.cz -- restart online update if there are some selected patches left to +- restart online update if there are some selected patches left to installation (#165540) - 2.13.48 @@ -1590,7 +1596,7 @@ Wed Apr 5 15:09:52 CEST 2006 - sh(a)suse.de - V 2.13.44 -- Fixed bug #116356: save_y2logs saves into a different directory +- Fixed bug #116356: save_y2logs saves into a different directory ------------------------------------------------------------------- Wed Apr 5 11:36:03 CEST 2006 - fehr(a)suse.de @@ -1744,7 +1750,7 @@ - Removing obsolete support for NetworkManager which have changed its behavior again (#149075). Changing firewall, firewall proposal and CWM firewall. -- 2.13.28 +- 2.13.28 ------------------------------------------------------------------- Thu Feb 9 17:04:13 CET 2006 - locilka(a)suse.cz @@ -1781,7 +1787,7 @@ confirm continuing the configuration when NetworkManager is enabled. - Merged texts from proofreading. -- 2.13.26 +- 2.13.26 ------------------------------------------------------------------- Mon Jan 23 17:06:18 CET 2006 - mvidner(a)suse.cz @@ -1873,7 +1879,7 @@ ------------------------------------------------------------------- Wed Jan 4 11:12:18 CET 2006 - visnov(a)suse.cz -- Dropped Require.ycp, long time obsolete library +- Dropped Require.ycp, long time obsolete library - Dropped commandline.ycp obsolete wrapper ------------------------------------------------------------------- @@ -1904,7 +1910,7 @@ Tue Dec 20 11:13:26 CET 2005 - visnov(a)suse.cz - Include bash completion script -- 2.13.16 +- 2.13.16 ------------------------------------------------------------------- Mon Dec 19 17:20:03 CET 2005 - mvidner(a)suse.cz @@ -1917,7 +1923,7 @@ Mon Dec 19 15:34:37 CET 2005 - jsuchome(a)suse.cz - merged texts from proofreading -- 2.13.14 +- 2.13.14 ------------------------------------------------------------------- Wed Dec 14 16:08:39 CET 2005 - mvidner(a)suse.cz @@ -2001,7 +2007,7 @@ to enabled/disable widgets before the first real UserInput takes place - prevent double tab initialization at tab set initialization - 2.13.10 - + ------------------------------------------------------------------- Fri Nov 11 10:05:46 CET 2005 - jsrain(a)suse.cz @@ -2133,7 +2139,7 @@ Mon Sep 5 22:39:56 CEST 2005 - locilka(a)suse.cz - fixing default SuSEfirewall2 logging values using the - GetDefaultValue() function for undefined and newly also for + GetDefaultValue() function for undefined and newly also for empty values for security reasons (#100692). - 2.12.26 @@ -2147,7 +2153,7 @@ Mon Aug 22 12:33:42 CEST 2005 - jsuchome(a)suse.cz - added check for `cancel to ncurses menu loop (#105507) -- 2.12.24 +- 2.12.24 ------------------------------------------------------------------- Thu Aug 18 13:59:50 CEST 2005 - lslezak(a)suse.cz @@ -2187,7 +2193,7 @@ ------------------------------------------------------------------- Fri Aug 12 10:08:14 CEST 2005 - visnov(a)suse.cz -- added comments for translators +- added comments for translators ------------------------------------------------------------------- Tue Aug 9 16:10:22 CEST 2005 - mvidner(a)suse.cz @@ -2263,7 +2269,7 @@ - Now using `opt(`hvstretch) in wizard to restore old laoyut behaviour: center content by default -- V 2.12.14 +- V 2.12.14 ------------------------------------------------------------------- Thu Jul 21 09:53:02 CEST 2005 - jsrain(a)suse.cz @@ -2300,20 +2306,20 @@ - Properly check if KDE is running in /sbin/yast so the sw_single module is started full-screen if that works flawlessly (KDE) -- V 2.12.10 +- V 2.12.10 ------------------------------------------------------------------- Mon Jul 11 18:20:44 CEST 2005 - sh(a)suse.de - Fixed NCurses wizard layout behaviour: Properly propagate content strechability to layout parent -- V 2.12.9 +- V 2.12.9 ------------------------------------------------------------------- Fri Jul 8 16:03:01 CEST 2005 - visnov(a)suse.cz - adapt build dependencies for blocxx -- 2.12.8 +- 2.12.8 ------------------------------------------------------------------- Fri Jul 1 12:48:43 CEST 2005 - jsrain(a)suse.cz @@ -2332,7 +2338,7 @@ Mon Jun 13 17:04:03 CEST 2005 - lslezak(a)suse.cz - command line - 'xmlhelp' command (store command line help of - a client in XML format) + a client in XML format) ------------------------------------------------------------------- Mon Jun 6 10:24:53 CEST 2005 - jsrain(a)suse.cz @@ -2416,7 +2422,7 @@ Tue Apr 5 14:45:07 CEST 2005 - visnov(a)suse.cz - fix NFB -- 2.12.1 +- 2.12.1 ------------------------------------------------------------------- Mon Apr 4 10:27:58 CEST 2005 - jsrain(a)suse.cz @@ -2433,7 +2439,7 @@ Thu Mar 31 11:10:12 CEST 2005 - locilka(a)suse.cz - Changed firewall proposal texts to be clearly translatable - (#73612) + (#73612) ------------------------------------------------------------------- Thu Mar 24 13:07:15 CET 2005 - jsrain(a)suse.cz @@ -2443,7 +2449,7 @@ ------------------------------------------------------------------- Mon Mar 21 16:25:33 CET 2005 - sh(a)suse.de -- Fixed bug #72799: Help/Steps buttons not translated +- Fixed bug #72799: Help/Steps buttons not translated - V 2.11.48 ------------------------------------------------------------------- @@ -2462,12 +2468,12 @@ ------------------------------------------------------------------- Wed Mar 16 16:50:03 CET 2005 - visnov(a)suse.cz -- 2.11.45 +- 2.11.45 ------------------------------------------------------------------- Tue Mar 15 13:40:39 CET 2005 - visnov(a)suse.cz -- added check-all-syntax script for validating all YCP clients +- added check-all-syntax script for validating all YCP clients and modules (#63942) ------------------------------------------------------------------- @@ -2527,7 +2533,7 @@ Wed Mar 2 11:22:33 CET 2005 - locilka(a)suse.cz - merged proofed texts -- 2.11.38 +- 2.11.38 ------------------------------------------------------------------- Fri Feb 25 15:24:07 CET 2005 - lslezak(a)suse.cz @@ -2539,7 +2545,7 @@ ------------------------------------------------------------------- Fri Feb 25 13:20:17 CET 2005 - visnov(a)suse.cz -- 2.11.35 +- 2.11.35 ------------------------------------------------------------------- Fri Feb 25 13:11:07 CET 2005 - lslezak(a)suse.cz @@ -2629,7 +2635,7 @@ Tue Feb 8 17:03:02 CET 2005 - sh(a)suse.de - Added icons to standard popups -- V 2.11.26 +- V 2.11.26 ------------------------------------------------------------------- Tue Feb 8 16:09:19 CET 2005 - nashif(a)suse.de @@ -2650,7 +2656,7 @@ ------------------------------------------------------------------- Tue Feb 8 10:10:52 CET 2005 - jsuchome(a)suse.cz -- merged texts from proofreading +- merged texts from proofreading - 2.11.25 ------------------------------------------------------------------- @@ -2682,7 +2688,7 @@ Mon Jan 31 17:47:43 CET 2005 - sh(a)suse.de - Added Show|HideReleaseNotesButton() to Wizard:: -- V 2.11.21 +- V 2.11.21 ------------------------------------------------------------------- Mon Jan 31 10:46:33 CET 2005 - locilka(a)suse.cz @@ -2826,7 +2832,7 @@ ------------------------------------------------------------------- Tue Nov 30 12:40:31 CET 2004 - locilka(a)suse.cz -- Moved CWMFirewallInterfaces from yast2-firewall to yast2 rpm +- Moved CWMFirewallInterfaces from yast2-firewall to yast2 rpm ------------------------------------------------------------------- Tue Nov 30 10:47:06 CET 2004 - visnov(a)suse.cz Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=43940&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Mon Jan 28 13:05:29 2008 @@ -6,6 +6,7 @@ # Authors: Mathias Kettner <kettner(a)suse.de> # Klaus Kaempf <kkaempf(a)suse.de> # Ludwig Nussel <lnussel(a)suse.de> +# Arvin Schnell <aschnell(a)suse.de> # # This script is called when the user just types 'yast2'. It starts # the qt user interface in case the DISPLAY variable is set and other- @@ -16,7 +17,7 @@ # allow for a different prefix mydir=${0%/[YyZz]a[Ss][Tt]*} -if [ -z "$mydir" -o "$mydir" = "/sbin" ]; then +if [ -z "$mydir" -o "$mydir" = "/sbin" ]; then YAST_PREFIX=/usr else YAST_PREFIX=${mydir%/sbin} @@ -57,7 +58,7 @@ # --fullscreen # --noborder # well also for gtk and ncurses -Y2QT_ARGS="" +Y2UI_ARGS="" GNOME_SHELL="$ybindir/y2controlcenter-gnome" KDE_SHELL="$ybindir/y2controlcenter" @@ -151,7 +152,7 @@ probe_desktop_gui WANTED_GUI=$DESKTOP_GUI fi - + if [ "$WANTED_GUI" = "gtk" ]; then if check_gtk; then SELECTED_GUI=gtk @@ -188,9 +189,9 @@ -i|--install) Y2_INSTALL_PACKAGES=true; shift ;; --update) Y2_INSTALL_PACKAGES=true; Y2_INSTALL_ACTION=--update; shift ;; --remove) Y2_INSTALL_PACKAGES=true; Y2_INSTALL_ACTION=--remove; shift ;; - --fullscreen) Y2QT_ARGS="$Y2QT_ARGS --fullscreen"; shift ;; - --noborder) Y2QT_ARGS="$Y2QT_ARGS --noborder" ; shift ;; - --kcontrol) Y2QT_ARGS="$Y2QT_ARGS --kcontrol_id YaST" ; shift ;; + --fullscreen) Y2UI_ARGS="$Y2UI_ARGS --fullscreen"; shift ;; + --noborder) Y2UI_ARGS="$Y2UI_ARGS --noborder" ; shift ;; + --kcontrol) Y2UI_ARGS="$Y2UI_ARGS --kcontrol_id YaST" ; shift ;; --qt) CMDLINE_UI="qt" ; shift ;; --gtk) CMDLINE_UI="gtk" ; shift ;; --ncurses) unset DISPLAY ; shift ;; @@ -363,13 +364,13 @@ fi # this fixes launching of interactive subprocesses, #150799 - #Y2QT_ARGS="$Y2QT_ARGS --nothreads" - #uncomment the above line if anything in TUI breaks ;-) + #Y2UI_ARGS="$Y2UI_ARGS --nothreads" + #uncomment the above line if anything in TUI breaks ;-) #threads are welcomed back in ncurses frontend (F#301899) # set color theme, if defined if [ ! -z "$Y2NCURSES_COLOR_THEME" ]; then - export Y2NCURSES_COLOR_THEME="$Y2NCURSES_COLOR_THEME" + export Y2NCURSES_COLOR_THEME="$Y2NCURSES_COLOR_THEME" fi else @@ -379,7 +380,10 @@ fi # quick hack: treat gtk like qt elif [ "$SELECTED_GUI" = "qt" -o "$SELECTED_GUI" = "gtk" ]; then - set_qt_home_dir + + if [ "$SELECTED_GUI" = "qt" ]; then + set_qt_home_dir + fi # find which control center shell we want, if there is none we # fall back to the built-in ycp menu @@ -401,9 +405,9 @@ # matching "*/", leaving only the last path name component. if [ $module == "sw_single" ] ; then - case "$Y2QT_ARGS" in + case "$Y2UI_ARGS" in *fullscreen*) ;; - *) Y2QT_ARGS="$Y2QT_ARGS --fullscreen" ;; + *) Y2UI_ARGS="$Y2UI_ARGS --fullscreen" ;; esac fi fi @@ -415,7 +419,7 @@ # do it! # $@ are args for ycp if [ $module == "menu" -a -f "$y2ccbin" ] ; then - $y2ccbin $Y2QT_ARGS "$@" + $y2ccbin $Y2UI_ARGS "$@" exit_code=$? else # loop while necessary @@ -426,7 +430,7 @@ esac # break out on errors, #343258 while [ $exit_code = 0 ]; do - $ybindir/y2base $module "$@" "$SELECTED_GUI" $Y2_GEOMETRY $Y2QT_ARGS + $ybindir/y2base $module "$@" "$SELECTED_GUI" $Y2_GEOMETRY $Y2UI_ARGS exit_code=$? if [ -z "$REDO_FILE" -o ! -f "$REDO_FILE" ]; then break Modified: trunk/yast2/scripts/yast2-funcs URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2-funcs?rev=43… ============================================================================== --- trunk/yast2/scripts/yast2-funcs (original) +++ trunk/yast2/scripts/yast2-funcs Mon Jan 28 13:05:29 2008 @@ -12,11 +12,6 @@ logdir=/var/log/YaST2 -# font for qt -# obsolete, we should not need it anymore, adrian -# Y2_XFONT="-gnu-unifont-medium-r-normal--16-160-75-75-p-80-iso10646-1" - - # # check if plugins are in lib or lib64 subdir and sets the variable # plugindir accordingly @@ -54,7 +49,7 @@ } # -# check if the qt plugin and all necessary libaries are present +# check if the qt plugin and all necessary libraries are present # function check_qt() { @@ -62,7 +57,7 @@ } # -# check if the ncurses plugin and all necessary libaries are present +# check if the gtk plugin and all necessary libraries are present # function check_gtk() { @@ -70,7 +65,7 @@ } # -# check if the ncurses plugin and all necessary libaries are present +# check if the ncurses plugin and all necessary libraries are present # function check_ncurses() { @@ -94,7 +89,7 @@ if [ -z "$LANG" -a -r /etc/sysconfig/language ] ; then . /etc/sysconfig/language if [ -n "$RC_LANG" ] ; then - export LANG=$RC_LANG + export LANG=$RC_LANG fi fi } @@ -104,7 +99,7 @@ { local user="$USER" if [ "$KDESU_USER" ]; then - user="$KDESU_USER" + user="$KDESU_USER" fi temp_QT_HOME_DIR="$( getent passwd $user | cut -d : -f 6)/.qt/" if test -r "$temp_QT_HOME_DIR/qtrc"; then @@ -116,7 +111,7 @@ function set_inst_qt_env() { export XCURSOR_THEME="DMZ" - export QT_HOME_DIR="`eval echo /tmp/.qt/`" + export QT_HOME_DIR="/tmp/.qt/" mkdir -p /tmp/.qt [ -e /usr/share/desktop-data/qtrc ] && cp /usr/share/desktop-data/qtrc /tmp/.qt/ } @@ -128,6 +123,18 @@ } +function set_inst_gtk_env() +{ + export XCURSOR_THEME="DMZ" +} + + +function clr_inst_gtk_env() +{ + : +} + + ### Local Variables: *** ### mode: shell-script *** ### End: *** -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0