From 1044a5a6322936b33b070918b564e669db758aec Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 28 Mar 2001 12:39:37 +0000
Subject: add fstab in the log

---
 perl-install/commands.pm      | 8 ++++++--
 perl-install/install_steps.pm | 2 +-
 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);
 }
-- 
cgit v1.2.1