merge from taroon. highlights of this time around

* ppc boot constraints
* md5 endianness
* don't prompt to save tracebacks to a floppy without a floppy
* autopart for kickstart
* network configuration in the loader if vnc/display case

1 files changed, 4 insertions, 4 deletions

diff --git a/isys/vio.c b/isys/vio.c
index 1d4ffb13f..be4062315 100644
--- a/isys/vio.c
+++ b/isys/vio.c
@@ -41,7 +41,6 @@ int vioGetCdDevs(struct knownDevices * devices) {
     i = readFD(fd, &buf);
     if (i < 1) {
         close(fd);
-        free (buf);
 	fprintf(stderr, "error reading /proc/iSeries/viocd!\n");
         return 1;
     }
@@ -120,7 +119,6 @@ int vioGetDasdDevs(struct knownDevices * devices) {
     i = readFD(fd, &buf);
     if (i < 1) {
         close(fd);
-        free (buf);
 	fprintf(stderr, "error reading /proc/iSeries/viodasd!\n");
         return 1;
     }
@@ -191,12 +189,14 @@ int isVioConsole(void) {
 	return 0;
     }
     i = readFD(fd, &buf);
-    if (i == -1) {
+    if (i < 1) {
         close(fd);
-        free(buf);
 	fprintf(stderr, "error reading /proc/tty/drivers!\n");
         return 0;
     }
+    close(fd);
+    buf[i] = '\0';
+
     isviocons = 0;
     start = buf;
     while (start && *start) {