From 3d2e77074f48cb26a374c967e39712f400d9aa58 Mon Sep 17 00:00:00 2001
From: "Anton V. Boyarshinov" <boyarsh@altlinux.org>
Date: Sat, 20 Nov 2010 19:20:08 +0300
Subject: [PATCH] tty3 creation waiting /dev/disk added

---
 cdrom.c | 11 ++++++++++-
 disk.c  |  7 +++++++
 init.c  |  1 -
 log.c   | 11 +++--------
 tools.h |  1 +
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/cdrom.c b/cdrom.c
index e18d6f6..89b07cb 100644
--- a/cdrom.c
+++ b/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;
diff --git a/disk.c b/disk.c
index 4f9b0d5..2d037cc 100644
--- a/disk.c
+++ b/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;
diff --git a/init.c b/init.c
index 199feb6..366d577 100644
--- a/init.c
+++ b/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
 
diff --git a/log.c b/log.c
index 759bad3..47c7d30 100644
--- a/log.c
+++ b/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++ ) {
-			logfile = fopen("/dev/tty3", "w");
-			if(logfile != NULL) break;
-			fprintf(stderr,"\rwaiting for /dev/tty3: %d",i);
-			sleep(1);
-		}
+		mknod("/dev/tty3", S_IFCHR, MKDEV(4, 3));
+		logfile = fopen("/dev/tty3", "w");
 		if (!logfile)
 			logfile = fopen("/tmp/install.log", "a");
 	}
diff --git a/tools.h b/tools.h
index 51c429a..55286a7 100644
--- a/tools.h
+++ b/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