diff options
| author | Bill Nottingham <notting@redhat.com> | 2005-05-03 20:41:13 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2005-05-03 20:41:13 +0000 |
| commit | 1449b02ba926481cb331d1dc7b7808f37dc42dd6 (patch) | |
| tree | 001da052809cafb1f28b5e5220cff3a45fd4dc63 | |
| parent | 1201666d2bc412f6c8b8101291c4d795753c8712 (diff) | |
| download | anaconda-1449b02ba926481cb331d1dc7b7808f37dc42dd6.tar.gz anaconda-1449b02ba926481cb331d1dc7b7808f37dc42dd6.tar.xz anaconda-1449b02ba926481cb331d1dc7b7808f37dc42dd6.zip | |
always reset terminal attributes on ppc (#156411)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | loader2/init.c | 9 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2005-05-03 Bill Nottingham <notting@redhat.com> + + * loader2/init.c: always reset terminal attributes on ppc (#156411) + 2005-05-03 Jeremy Katz <katzj@redhat.com> * anaconda: More pmac X hacking -- look at what the fb is running diff --git a/loader2/init.c b/loader2/init.c index 6e4f873ec..91e19b1c9 100644 --- a/loader2/init.c +++ b/loader2/init.c @@ -600,9 +600,6 @@ int main(int argc, char **argv) { for (i = 0; consoles[i] != NULL; i++) { #if defined(__powerpc__) if ((fd = open(consoles[i], O_RDWR)) >= 0 && !tcgetattr(fd, &mode) && !termcmp(&cmode, &mode)) { - cfd = open("/dev/console", O_WRONLY); - tcsetattr(cfd,TCSANOW,&orig_cmode); - close(cfd); #else if ((fd = open(consoles[i], O_RDWR)) >= 0) { #endif @@ -614,6 +611,12 @@ int main(int argc, char **argv) { } } +#if defined(__powerpc__) + cfd = open("/dev/console", O_WRONLY); + tcsetattr(cfd,TCSANOW,&orig_cmode); + close(cfd); +#endif + if ((fd < 0) && (ioctl (0, TIOCLINUX, &twelve) < 0)) { isSerial = 2; if (ioctl(0, TIOCGSERIAL, &si) == -1) { |