diff options
| author | Peter Jones <pjones@redhat.com> | 2006-04-06 18:09:31 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2006-04-06 18:09:31 +0000 |
| commit | 33f955ba07598508b4d65504a2f33f1e384c47af (patch) | |
| tree | b87b90b05a052bdffbbfa9982273a5e4a607ae44 | |
| parent | 716724fdbe52cf7c82dbd7e347419455c0bbe370 (diff) | |
| download | anaconda-33f955ba07598508b4d65504a2f33f1e384c47af.tar.gz anaconda-33f955ba07598508b4d65504a2f33f1e384c47af.tar.xz anaconda-33f955ba07598508b4d65504a2f33f1e384c47af.zip | |
- always reset terminal attributes on ppc (#166302)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | loader2/init.c | 9 |
2 files changed, 10 insertions, 6 deletions
@@ -3,11 +3,12 @@ * isys/isys.py (hardDriveDict): don't put removable drives in the isys hard drive list (#147504) * kickstart.py (KickstartBase.defineLogicalVolume): Check for missing - vg declaration earlier so the error message makes sense (#176989). - * network.py (NetworkDevice.__str__): quote ethtool opts properly - (#176918) + vg declaration earlier so the error message makes sense (#176989) + * network.py (NetworkDevice.__str__): quote ethtool opts + properly (#176918) * docs/kickstart-docs.txt: add selinux (#175868) * loader2/module-info: add qla2xxx (#174993) + * loader2/init.c: always reset terminal attributes on ppc (#166302) 2006-02-17 Peter Jones <pjones@redhat.com> diff --git a/loader2/init.c b/loader2/init.c index 495bfe65d..5096d4681 100644 --- a/loader2/init.c +++ b/loader2/init.c @@ -554,9 +554,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 @@ -568,6 +565,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) { |