From 6e1e62cecd622a8aaa897e1f57eb75337d19158f Mon Sep 17 00:00:00 2001 From: murray Date: Tue, 25 Sep 2001 00:28:26 +0000 Subject: [PATCH] Back out rev 1.74. This functionality causes a panic on 4.4-RELEASE floppies if you try to actually use it. This code will work fine if you build and use sysinstall on a running system, since you have the benefit of an installed termcap file. However, this code does not work on an MFSROOT, where you must set the TERMCAP environment variable properly. Unfortunately the quick fix of setting the TERMCAP variable doesn't seem to fix the problem either. olgeni will add this functionality back once it's been fully implemented (hopefully using the working code in termcap.c). PR: bin/30739 Submitted by: Alexey V. Neyman Discussed with / Pointy hat to: olgeni MFC after: 3 days --- usr.sbin/sysinstall/options.c | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c index b085092cc6ca..bf822391a601 100644 --- a/usr.sbin/sysinstall/options.c +++ b/usr.sbin/sysinstall/options.c @@ -40,7 +40,6 @@ #include int fixitTtyWhich(dialogMenuItem *); -int termSetType(dialogMenuItem *); static char * varCheck(Option opt) @@ -127,8 +126,6 @@ static Option Options[] = { OPT_IS_FUNC, mediaSetFTPUserPass, VAR_FTP_USER, varCheck }, { "Editor", "Which text editor to use during installation", OPT_IS_VAR, EDITOR_PROMPT, VAR_EDITOR, varCheck }, -{ "Terminal", "Set terminal type (TERMCAP)", - OPT_IS_FUNC, termSetType, VAR_TERM, varCheck }, { "Tape Blocksize", "Tape media block size in 512 byte blocks", OPT_IS_VAR, TAPE_PROMPT, VAR_TAPE_BLOCKSIZE, varCheck }, { "Extract Detail", "How verbosely to display file name information during extractions", @@ -338,32 +335,3 @@ fixitTtyWhich(dialogMenuItem *self) } return DITEM_SUCCESS; } - -/* Select terminal type */ -int -termSetType(dialogMenuItem *self) -{ - char *cp = variable_get(VAR_TERM); - - if (!cp) { - msgConfirm("TERMCAP is not set to anything!"); - return DITEM_FAILURE; - } - else { - if (!strcmp(cp, "ansi")) - variable_set2(VAR_TERM, "vt100", 0); - else if (!strcmp(cp, "vt100")) - variable_set2(VAR_TERM, "cons25w", 0); - else if (!strcmp(cp, "cons25w")) - variable_set2(VAR_TERM, "cons25", 0); - else if (!strcmp(cp, "cons25")) - variable_set2(VAR_TERM, "cons25-m", 0); - else if (!strcmp(cp, "cons25-m")) - variable_set2(VAR_TERM, "xterm", 0); - else /* must be "high" - wrap around */ - variable_set2(VAR_TERM, "ansi", 0); - } - - setterm (cp); - return DITEM_SUCCESS; -}