From ab72206afef20f95422a6c901a6ff8ec04e18429 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 5 Apr 2001 10:35:23 +0000
Subject: - move report_bug in install_any - g_auto_install generates the
 auto_inst.cfg string without output'ing it

---
 perl-install/commands.pm | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

(limited to 'perl-install/commands.pm')

diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 6300b315a..c4dd279d2 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -569,34 +569,6 @@ sub  install_cpio($$;@) {
     "$dir/$name";
 }
 
-sub report_bug {
-    my ($prefix) = @_;
-
-    sub header { "
-********************************************************************************
-* $_[0]
-********************************************************************************";
-    }
-
-    join '', map { chomp; "$_\n" }
-      header("lspci"), detect_devices::stringlist(),
-      header("pci_devices"), cat_("/proc/bus/pci/devices"),
-      header("fdisk"), arch() =~ /ppc/ ? `$ENV{LD_LOADER} pdisk -l` : `$ENV{LD_LOADER} fdisk -l`,
-      header("scsi"), cat_("/proc/scsi/scsi"),
-      header("lsmod"), cat_("/proc/modules"),
-      header("cmdline"), cat_("/proc/cmdline"),
-      header("pcmcia: stab"), cat_("/var/run/stab"),
-      header("usb"), cat_("/proc/bus/usb/devices"),
-      header("partitions"), cat_("/proc/partitions"),
-      header("cpuinfo"), cat_("/proc/cpuinfo"),
-      header("syslog"), cat_("/tmp/syslog"),
-      header("ddcxinfos"), `$ENV{LD_LOADER} ddcxinfos`,
-      header("ddebug.log"), cat_("/tmp/ddebug.log"),
-      header("install.log"), cat_("$prefix/root/install.log"),
-      header("fstab"), cat_("$prefix/etc/fstab"),
-      ;
-}
-
 sub bug {
     my ($h) = getopts(\@_, "h");
     $h and die "usage: bug\nput file report.bug on fat formatted floppy\n";
@@ -604,7 +576,8 @@ sub bug {
     require detect_devices;
     mount devices::make(detect_devices::floppy()), "/fd0";
 
-    output "/fd0/report.bug", report_bug("/mnt"); #- no other way :-(
+    require install_any;
+    output "/fd0/report.bug", install_any::report_bug("/mnt"); #- no other way :-(
     umount "/fd0";
     sync;
 }
-- 
cgit v1.2.1