]>
Commit | Line | Data |
---|---|---|
c240867f | 1 | --- src/base/keyboard/keyb_clients.c.old Thu Apr 4 02:00:53 2002 |
2 | +++ src/base/keyboard/keyb_clients.c Thu Apr 4 02:01:10 2002 | |
3 | @@ -188,7 +188,7 @@ | |
e73414cf | 4 | } |
5 | else | |
6 | #endif | |
7 | - if (config.usesX || (config.console_keyb && can_do_root_stuff)) { | |
e73414cf | 8 | + if (config.usesX || config.console_keyb) { |
c240867f | 9 | if (config.usesX || config.console) |
e73414cf | 10 | Keyboard = &Keyboard_raw; |
c240867f | 11 | else { |
12 | --- src/env/video/vc.c.old Thu Apr 4 01:49:50 2002 | |
13 | +++ src/env/video/vc.c Thu Apr 4 01:50:13 2002 | |
14 | @@ -136,7 +136,7 @@ | |
15 | c_printf("major = %d minor = %d\n", | |
16 | major, minor); | |
17 | /* console major num is 4, minor 64 is the first serial line */ | |
18 | - if (can_do_root_stuff && (major == 4) && (minor < 64)) { | |
19 | + if ((major == 4) && (minor < 64)) { | |
20 | scr_state.console_no = minor; | |
21 | config.console=1; | |
22 | } | |
23 | --- src/base/init/config.c.old Sun Apr 7 18:42:14 2002 | |
24 | +++ src/base/init/config.c Sun Apr 7 18:43:05 2002 | |
25 | @@ -741,7 +741,7 @@ | |
26 | config.emuretrace = 0; /* already emulated */ | |
27 | } | |
28 | else { | |
29 | - if (!can_do_root_stuff && config.console) { | |
30 | + if (!can_do_root_stuff && config.console_video) { | |
31 | /* force use of Slang-terminal on console too */ | |
32 | config.console = config.console_video = config.vga = config.graphics = 0; | |
33 | config.cardtype = 0; |