Date: Fri, 5 Apr 2002 20:11:39 -0800 (PST) From: Murray Stokely <murray@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9164 for review Message-ID: <200204060411.g364Bdo69922@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9164 Change 9164 by murray@murray_builder on 2002/04/05 20:10:46 IFC: Add "xf86cfg -textmode" to the X configuration menu. Affected files ... ... //depot/releng/5_dp1/src/usr.sbin/sysinstall/config.c#2 integrate ... //depot/releng/5_dp1/src/usr.sbin/sysinstall/menus.c#6 integrate Differences ... ==== //depot/releng/5_dp1/src/usr.sbin/sysinstall/config.c#2 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/config.c,v 1.199 2002/02/10 01:34:04 rwatson Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/config.c,v 1.200 2002/04/06 02:39:27 murray Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -644,7 +644,7 @@ int configXSetup(dialogMenuItem *self) { - char *config, *execfile, *style; + char *config, *execfile, *execcmd, *style, *tmp; char *moused; WINDOW *w = savescr(); @@ -678,8 +678,12 @@ vsystem("ldconfig -aout /usr/lib/aout /usr/lib/compat/aout /usr/local/lib/aout /usr/X11R6/lib/aout"); vsystem("/sbin/ifconfig lo0 127.0.0.1"); - execfile = string_concat("/usr/X11R6/bin/", config); + execcmd = string_concat("/usr/X11R6/bin/", config); + execfile = strdup(execcmd); + if ((tmp = strchr(execfile, ' '))) + *tmp = '\0'; if (file_executable(execfile)) { + free(execfile); moused = variable_get(VAR_MOUSED); while (!moused || strcmp(moused, "YES")) { if (msgYesNo("The X server may access the mouse in two ways: direct access\n" @@ -697,7 +701,7 @@ "Choose \"/dev/sysmouse\" as the mouse port and \"SysMouse\" or\n" "\"MouseSystems\" as the mouse protocol in the X configuration\n" "utility."); - systemExecute(execfile); + systemExecute(execcmd); if (!file_readable("/etc/XF86Config")) { if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?")) goto tryagain; @@ -712,6 +716,7 @@ return DITEM_SUCCESS; } else { + free(execfile); msgConfirm("The XFree86 setup utility you chose does not appear to be installed!\n" "Please install this before attempting to configure XFree86."); restorescr(w); ==== //depot/releng/5_dp1/src/usr.sbin/sysinstall/menus.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.340 2002/04/02 20:42:52 obrien Exp $"; + "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.341 2002/04/06 02:42:27 murray Exp $"; #endif #include "sysinstall.h" @@ -904,18 +904,22 @@ DMenu MenuXF86Config = { DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS, "Please select the XFree86 configuration tool you want to use.", - "The first tool, xf86cfg, is fully graphical\n" - "The second tool, xf86config, is\n" + "The first option, xf86cfg, is fully graphical.\n" + "The second option provides a menu-based interface similar to\n" + "what you are currently using. " + "The third option, xf86config, is\n" "a more simplistic shell-script based tool and less friendly to\n" - "new users, but it may work in situations where the fancier one\n" - "does not.", + "new users, but it may work in situations where the other options\n" + "do not.", NULL, NULL, { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { "2 xf86cfg", "Fully graphical XFree86 configuration tool.", NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86cfg" }, - { "3 xf86config", "Shell-script based XFree86 configuration tool.", + { "3 xf86cfg -textmode", "ncurses-based XFree86 configuration tool.", + NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86cfg -textmode" }, + { "4 xf86config", "Shell-script based XFree86 configuration tool.", NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" }, { "D XDesktop", "X already set up, just do desktop configuration.", NULL, dmenuSubmenu, NULL, &MenuXDesktops }, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-releng" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204060411.g364Bdo69922>