summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-28 12:39:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-28 12:39:37 +0000
commit1044a5a6322936b33b070918b564e669db758aec (patch)
treee46207721c0e90636b8cbeebd12cec49019b9b21
parentad54afb58edb8157c696adfbd89def9146c4b53d (diff)
downloaddrakx-1044a5a6322936b33b070918b564e669db758aec.tar
drakx-1044a5a6322936b33b070918b564e669db758aec.tar.gz
drakx-1044a5a6322936b33b070918b564e669db758aec.tar.bz2
drakx-1044a5a6322936b33b070918b564e669db758aec.tar.xz
drakx-1044a5a6322936b33b070918b564e669db758aec.zip
add fstab in the log
-rw-r--r--perl-install/commands.pm8
-rw-r--r--perl-install/install_steps.pm2
2 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index ffdc306a7..41bb5face 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -570,6 +570,8 @@ sub install_cpio($$;@) {
}
sub report_bug {
+ my ($prefix) = @_;
+
sub header { "
********************************************************************************
* $_[0]
@@ -590,7 +592,8 @@ sub report_bug {
header("syslog"), cat_("/tmp/syslog"),
header("ddcxinfos"), `$ENV{LD_LOADER} ddcxinfos`,
header("ddebug.log"), cat_("/tmp/ddebug.log"),
- header("install.log"), cat_("/mnt/root/install.log"),
+ header("install.log"), cat_("$prefix/root/install.log"),
+ header("fstab"), cat_("$prefix/etc/fstab"),
;
}
@@ -601,7 +604,8 @@ sub bug {
require detect_devices;
mount devices::make(detect_devices::floppy()), "/fd0";
- output "/fd0/report.bug", report_bug();
+ output "/fd0/report.bug", report_bug("/mnt") #- no other way :-(
+);
umount "/fd0";
sync;
}
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 0c65acf03..041371321 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -819,7 +819,7 @@ sub miscellaneous {
#------------------------------------------------------------------------------
sub exitInstall {
my ($o) = @_;
- eval { output "$o->{prefix}/root/report.bug", commands::report_bug() };
+ eval { output "$o->{prefix}/root/report.bug", commands::report_bug($o->{prefix}) };
install_any::unlockCdrom;
install_any::log_sizes($o);
}