From 2503fda0b6c58efa3ad80198d434f031f7952371 Mon Sep 17 00:00:00 2001 From: Murray Stokely Date: Sat, 6 Apr 2002 02:42:27 +0000 Subject: [PATCH] Add "xf86cfg -textmode" to the list of options for configuring XFree86 4.X. Suggested by: many --- usr.sbin/sade/menus.c | 14 +++++++++----- usr.sbin/sysinstall/menus.c | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 279fa4b0a645..9ff06961cd21 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -904,18 +904,22 @@ DMenu MenuSrcDistributions = { 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 }, diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 279fa4b0a645..9ff06961cd21 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -904,18 +904,22 @@ DMenu MenuSrcDistributions = { 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 },