tty3 creation

waiting /dev/disk added

cdrom.c

@@ -123,8 +123,17 @@ enum return_type cdrom_prepare(void)
 	char * choice;
 	int i, count = 0;
 	enum return_type results;
+	int timeout=60;
+
 	update_splash();
 
+	fprintf(stderr,"%c[1A",27);
+	for(i=0; i<timeout; i++) {
+		sleep(1);
+		if(opendir("/dev/disk/"))break;
+		fprintf(stderr,"\rwaiting for /dev/disk/ %d...",i);
+	}
+
 	get_medias(CDROM, &medias, &medias_models);
 
 	ptr = medias;

disk.c

@@ -329,7 +329,14 @@ enum return_type disk_prepare(void)
 	char msg[256];
 	int i, count = 0;
 	enum return_type results;
+	int timeout = 60;
 
+	fprintf(stderr,"%c[1A",27);
+	for(i=0; i<timeout; i++) {
+		sleep(1);
+		if(opendir("/dev/disk/"))break;
+		fprintf(stderr,"\rwaiting for /dev/disk/ %d...",i);
+	}
 	get_medias(DISK, &medias, &medias_models);
 
 	ptr = medias;

init.c

@@ -37,7 +37,6 @@
 #include "lomount.h"
 #include "tools.h"
 
-#define MKDEV(ma,mi)    ((ma)<<8 | (mi))
 #define RAMFS_MAGIC 0x858458f6
 #define TMPFS_MAGIC 0x01021994
 

log.c

@@ -31,6 +31,7 @@
 
 #include "log.h"
 
+
 static FILE * logfile = NULL;
 
 
@@ -67,15 +68,9 @@ void log_perror(char *msg)
 
 void open_log(void)
 {
-	int i;
-	int timeout = 60;
 	if (!IS_TESTING) {
-		for(i=0; i < timeout; i++ ) {
+		mknod("/dev/tty3", S_IFCHR, MKDEV(4, 3));
-			logfile = fopen("/dev/tty3", "w");
+		logfile = fopen("/dev/tty3", "w");
-			if(logfile != NULL) break;
-			fprintf(stderr,"\rwaiting for /dev/tty3: %d",i);
-			sleep(1);
-		}
 		if (!logfile)
 			logfile = fopen("/tmp/install.log", "a");
 	}

tools.h

@@ -58,5 +58,6 @@ struct param_elem
 
 #define ptr_begins_static_str(pointer,static_str) (!strncmp(pointer,static_str,sizeof(static_str)-1))
 #define streq !strcmp
+#define MKDEV(ma,mi)    ((ma)<<8 | (mi))
 
 #endif