diff options
| author | jkh <jkh@FreeBSD.org> | 1999-05-12 04:52:41 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-05-12 04:52:41 +0000 |
| commit | 6045d0112071cf131e0789db486c678e7b19ccfd (patch) | |
| tree | 8a1b25042c084c8ea3172f7c8c565340bb1e27bd /release | |
| parent | 57cacb15f276d9d9652780766c4960a538fcbf20 (diff) | |
| download | FreeBSD-src-6045d0112071cf131e0789db486c678e7b19ccfd.zip FreeBSD-src-6045d0112071cf131e0789db486c678e7b19ccfd.tar.gz | |
Fix a couple of bogons in the X server/desktop setup menus.
Diffstat (limited to 'release')
| -rw-r--r-- | release/sysinstall/config.c | 19 | ||||
| -rw-r--r-- | release/sysinstall/menus.c | 10 |
2 files changed, 20 insertions, 9 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index b2f0f6f..e9d3c03 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.128 1999/04/28 07:20:11 jkh Exp $ + * $Id: config.c,v 1.129 1999/05/05 11:34:00 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -522,20 +522,28 @@ configXDesktop(dialogMenuItem *self) int configXSetup(dialogMenuItem *self) { - char *config, *execfile; + char *config, *execfile, *style; char *moused; tryagain: dialog_clear_norefresh(); + variable_unset(VAR_DESKSTYLE); + variable_unset(VAR_XF86_CONFIG); if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) return DITEM_FAILURE | DITEM_RESTORE; + config = variable_get(VAR_XF86_CONFIG); + style = variable_get(VAR_DESKSTYLE); + if (!config) { + if (style) + goto config_desktop; + else + return DITEM_FAILURE | DITEM_RESTORE; + } + if (file_readable("/var/run/ld.so.hints")) systemExecute("/sbin/ldconfig -m /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); else systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); - config = variable_get(VAR_XF86_CONFIG); - if (!config) - return DITEM_FAILURE | DITEM_RESTORE; execfile = string_concat("/usr/X11R6/bin/", config); if (file_executable(execfile)) { dialog_clear_norefresh(); @@ -564,6 +572,7 @@ tryagain: else return DITEM_FAILURE | DITEM_RESTORE; } +config_desktop: configXDesktop(self); return DITEM_SUCCESS | DITEM_RESTORE; } diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index b838743..c921cfb 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.198 1999/05/05 11:34:03 jkh Exp $ + * $Id: menus.c,v 1.199 1999/05/11 08:33:45 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1189,10 +1189,12 @@ DMenu MenuConfigure = { NULL, dmenuSubmenu, NULL, &MenuStartup }, { "8 Options", "View/Set various installation options", NULL, optionsEditor }, - { "D HTML Docs", "Go to the HTML documentation menu (post-install)", - NULL, docBrowser }, - { "X XFree86", "Configure XFree86", + { "X XFree86", "Configure XFree86 Server", NULL, configXSetup }, + { "X Desktop", "Configure XFree86 Desktop", + NULL, configXDesktop }, + { "H HTML Docs", "Go to the HTML documentation menu (post-install)", + NULL, docBrowser }, { "E Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { NULL } }, |
