summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/README6
-rw-r--r--mdk-stage1/log.c30
-rw-r--r--perl-install/any.pm1
3 files changed, 22 insertions, 15 deletions
diff --git a/docs/README b/docs/README
index dffa604e4..93f62004d 100644
--- a/docs/README
+++ b/docs/README
@@ -163,10 +163,12 @@ not interesting.
- alt-F7: the graphical install lives there
- command "bug" puts on floppy lots of interesting stuff.
-- /tmp/ddebug.log: same (or nearly the same) as alt-F3
+- /tmp/stage1.log: same as alt-F3 part when stage1 run (e.g. actions
+ before graphical install really begins)
+- /tmp/ddebug.log: (nearly the) same as latter alt-F3 part
- /tmp/syslog: same as alt-F4
- /mnt/root/ddebug.log: at the end of each step, DrakX tries to backup
-/tmp/ddebug.log to /mnt/root. Available only after mounting of /.
+ /tmp/ddebug.log to /mnt/root. Available only after mounting of /.
- /mnt/root/install.log: the log of the installation (or upgrade) of the rpms
(just like rpm's /mnt/tmp/(install|upgrade).log)
- /mnt/root/auto_inst.cfg.pl: a kickstart file generated at the end of each
diff --git a/mdk-stage1/log.c b/mdk-stage1/log.c
index 5379c96dd..319079fd7 100644
--- a/mdk-stage1/log.c
+++ b/mdk-stage1/log.c
@@ -31,27 +31,30 @@
#include "log.h"
+static FILE * logtty = NULL;
static FILE * logfile = NULL;
void vlog_message(const char * s, va_list args)
{
- fprintf(logfile, "* ");
- vfprintf(logfile, s, args);
- fprintf(logfile, "\n");
- fflush(logfile);
+ if (logfile) {
+ fprintf(logfile, "* ");
+ vfprintf(logfile, s, args);
+ fprintf(logfile, "\n");
+ fflush(logfile);
+ }
+ if (logtty) {
+ fprintf(logtty, "* ");
+ vfprintf(logtty, s, args);
+ fprintf(logtty, "\n");
+ fflush(logtty);
+ }
}
void log_message(const char * s, ...)
{
va_list args;
-
- if (!logfile) {
- fprintf(stderr, "Log is not open!\n");
- return;
- }
-
va_start(args, s);
vlog_message(s, args);
va_end(args);
@@ -68,9 +71,8 @@ void log_perror(char *msg)
void open_log(void)
{
if (!IS_TESTING) {
- logfile = fopen("/dev/tty3", "w");
- if (!logfile)
- logfile = fopen("/tmp/install.log", "a");
+ logtty = fopen("/dev/tty3", "w");
+ logfile = fopen("/tmp/stage1.log", "w");
}
else
logfile = fopen("debug.log", "w");
@@ -81,5 +83,7 @@ void close_log(void)
if (logfile) {
log_message("stage1: disconnecting life support systems");
fclose(logfile);
+ if (logtty)
+ fclose(logtty);
}
}
diff --git a/perl-install/any.pm b/perl-install/any.pm
index ffd908f63..e82bba86a 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -852,6 +852,7 @@ sub report_bug {
header("cpuinfo"), cat_("/proc/cpuinfo"),
header("syslog"), cat_("/tmp/syslog"),
header("ddcxinfos"), `$ENV{LD_LOADER} ddcxinfos`,
+ header("stage1.log"), cat_("/tmp/stage1.log"),
header("ddebug.log"), cat_("/tmp/ddebug.log"),
header("install.log"), cat_("$prefix/root/install.log"),
header("fstab"), cat_("$prefix/etc/fstab"),