diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 2000-07-21 20:45:56 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 2000-07-21 20:45:56 +0000 |
| commit | b0b14858138a2f58c0ba498d5ff856ed0baaec2f (patch) | |
| tree | 027de0090c1e0db37be34ba44fcda66b8493cd21 | |
| parent | 49776176794d195bdacade9ec7a138d50b4503e4 (diff) | |
Notes
| -rw-r--r-- | release/sysinstall/Makefile | 3 | ||||
| -rw-r--r-- | release/sysinstall/install.c | 3 | ||||
| -rw-r--r-- | release/sysinstall/sysinstall.h | 1 | ||||
| -rw-r--r-- | release/sysinstall/termcap.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sade/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/sade/install.c | 3 | ||||
| -rw-r--r-- | usr.sbin/sade/sade.h | 1 | ||||
| -rw-r--r-- | usr.sbin/sade/termcap.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 3 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 1 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/termcap.c | 6 |
12 files changed, 30 insertions, 9 deletions
diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile index 6620bc0fd92e..0aeb6dcea5cc 100644 --- a/release/sysinstall/Makefile +++ b/release/sysinstall/Makefile @@ -58,6 +58,9 @@ makedevs.c: Makefile rtermcap keymap.h ./rtermcap vt100 | \ file2c 'const char termcap_vt100[] = {' ',0};' \ >> makedevs.tmp + ./rtermcap xterm | \ + file2c 'const char termcap_xterm[] = {' ',0};' \ + >> makedevs.tmp .if ${MACHINE} == "i386" file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp echo "size_t boot0_size = sizeof(boot0);" >> makedevs.tmp diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 209c210e22b2..7c43f65003da 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -1152,7 +1152,8 @@ create_termcap(void) const char *caps[] = { termcap_vt100, termcap_cons25, termcap_cons25_m, termcap_cons25r, - termcap_cons25r_m, termcap_cons25l1, termcap_cons25l1_m, NULL, + termcap_cons25r_m, termcap_cons25l1, termcap_cons25l1_m, + termcap_xterm, NULL, }; const char **cp; diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h index abb2b8e147f7..9d78d39f1711 100644 --- a/release/sysinstall/sysinstall.h +++ b/release/sysinstall/sysinstall.h @@ -604,6 +604,7 @@ extern const char termcap_cons25r[]; extern const char termcap_cons25r_m[]; extern const char termcap_cons25l1[]; extern const char termcap_cons25l1_m[]; +extern const char termcap_xterm[]; extern const u_char font_iso_8x16[]; extern const u_char font_cp850_8x16[]; extern const u_char font_cp866_8x16[]; diff --git a/release/sysinstall/termcap.c b/release/sysinstall/termcap.c index 5025dcdce3a6..93701776251f 100644 --- a/release/sysinstall/termcap.c +++ b/release/sysinstall/termcap.c @@ -31,7 +31,8 @@ prompt_term(char **termp, char **termcapp) { "vt100", termcap_vt100 }, { "cons25w", termcap_cons25w }, { "cons25", termcap_cons25 }, - { "cons25-m", termcap_cons25_m } }; + { "cons25-m", termcap_cons25_m }, + { "xterm", termcap_xterm } }; if (RunningAsInit) { while (1) { @@ -44,7 +45,8 @@ prompt_term(char **termp, char **termcapp) printf("2 ...................... VT100 or compatible terminal.\n"); printf("3 ...................... FreeBSD system console (color).\n"); printf("4 ...................... FreeBSD system console (monochrome).\n\n"); - printf("Your choice: (1-4) "); + printf("5 ...................... xterm terminal emulator.\n\n"); + printf("Your choice: (1-5) "); fflush(stdout); fgets(str, 80, stdin); i = str[0] - '0'; diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index 6620bc0fd92e..0aeb6dcea5cc 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -58,6 +58,9 @@ makedevs.c: Makefile rtermcap keymap.h ./rtermcap vt100 | \ file2c 'const char termcap_vt100[] = {' ',0};' \ >> makedevs.tmp + ./rtermcap xterm | \ + file2c 'const char termcap_xterm[] = {' ',0};' \ + >> makedevs.tmp .if ${MACHINE} == "i386" file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp echo "size_t boot0_size = sizeof(boot0);" >> makedevs.tmp diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 209c210e22b2..7c43f65003da 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -1152,7 +1152,8 @@ create_termcap(void) const char *caps[] = { termcap_vt100, termcap_cons25, termcap_cons25_m, termcap_cons25r, - termcap_cons25r_m, termcap_cons25l1, termcap_cons25l1_m, NULL, + termcap_cons25r_m, termcap_cons25l1, termcap_cons25l1_m, + termcap_xterm, NULL, }; const char **cp; diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index abb2b8e147f7..9d78d39f1711 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -604,6 +604,7 @@ extern const char termcap_cons25r[]; extern const char termcap_cons25r_m[]; extern const char termcap_cons25l1[]; extern const char termcap_cons25l1_m[]; +extern const char termcap_xterm[]; extern const u_char font_iso_8x16[]; extern const u_char font_cp850_8x16[]; extern const u_char font_cp866_8x16[]; diff --git a/usr.sbin/sade/termcap.c b/usr.sbin/sade/termcap.c index 5025dcdce3a6..93701776251f 100644 --- a/usr.sbin/sade/termcap.c +++ b/usr.sbin/sade/termcap.c @@ -31,7 +31,8 @@ prompt_term(char **termp, char **termcapp) { "vt100", termcap_vt100 }, { "cons25w", termcap_cons25w }, { "cons25", termcap_cons25 }, - { "cons25-m", termcap_cons25_m } }; + { "cons25-m", termcap_cons25_m }, + { "xterm", termcap_xterm } }; if (RunningAsInit) { while (1) { @@ -44,7 +45,8 @@ prompt_term(char **termp, char **termcapp) printf("2 ...................... VT100 or compatible terminal.\n"); printf("3 ...................... FreeBSD system console (color).\n"); printf("4 ...................... FreeBSD system console (monochrome).\n\n"); - printf("Your choice: (1-4) "); + printf("5 ...................... xterm terminal emulator.\n\n"); + printf("Your choice: (1-5) "); fflush(stdout); fgets(str, 80, stdin); i = str[0] - '0'; diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index 6620bc0fd92e..0aeb6dcea5cc 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -58,6 +58,9 @@ makedevs.c: Makefile rtermcap keymap.h ./rtermcap vt100 | \ file2c 'const char termcap_vt100[] = {' ',0};' \ >> makedevs.tmp + ./rtermcap xterm | \ + file2c 'const char termcap_xterm[] = {' ',0};' \ + >> makedevs.tmp .if ${MACHINE} == "i386" file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp echo "size_t boot0_size = sizeof(boot0);" >> makedevs.tmp diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 209c210e22b2..7c43f65003da 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -1152,7 +1152,8 @@ create_termcap(void) const char *caps[] = { termcap_vt100, termcap_cons25, termcap_cons25_m, termcap_cons25r, - termcap_cons25r_m, termcap_cons25l1, termcap_cons25l1_m, NULL, + termcap_cons25r_m, termcap_cons25l1, termcap_cons25l1_m, + termcap_xterm, NULL, }; const char **cp; diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index abb2b8e147f7..9d78d39f1711 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -604,6 +604,7 @@ extern const char termcap_cons25r[]; extern const char termcap_cons25r_m[]; extern const char termcap_cons25l1[]; extern const char termcap_cons25l1_m[]; +extern const char termcap_xterm[]; extern const u_char font_iso_8x16[]; extern const u_char font_cp850_8x16[]; extern const u_char font_cp866_8x16[]; diff --git a/usr.sbin/sysinstall/termcap.c b/usr.sbin/sysinstall/termcap.c index 5025dcdce3a6..93701776251f 100644 --- a/usr.sbin/sysinstall/termcap.c +++ b/usr.sbin/sysinstall/termcap.c @@ -31,7 +31,8 @@ prompt_term(char **termp, char **termcapp) { "vt100", termcap_vt100 }, { "cons25w", termcap_cons25w }, { "cons25", termcap_cons25 }, - { "cons25-m", termcap_cons25_m } }; + { "cons25-m", termcap_cons25_m }, + { "xterm", termcap_xterm } }; if (RunningAsInit) { while (1) { @@ -44,7 +45,8 @@ prompt_term(char **termp, char **termcapp) printf("2 ...................... VT100 or compatible terminal.\n"); printf("3 ...................... FreeBSD system console (color).\n"); printf("4 ...................... FreeBSD system console (monochrome).\n\n"); - printf("Your choice: (1-4) "); + printf("5 ...................... xterm terminal emulator.\n\n"); + printf("Your choice: (1-5) "); fflush(stdout); fgets(str, 80, stdin); i = str[0] - '0'; |
