summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-12-08 14:16:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-12-08 14:16:48 +0000
commit72f50dd4f1f871dd01cb0701f1de2694d5714a8f (patch)
tree1d96dc920a8ada67605a311ee6a9e7ef55de3f52
parent0361d0c2f75058b7fa949eec1880997131a912b9 (diff)
downloaddrakx-backup-do-not-use-72f50dd4f1f871dd01cb0701f1de2694d5714a8f.tar
drakx-backup-do-not-use-72f50dd4f1f871dd01cb0701f1de2694d5714a8f.tar.gz
drakx-backup-do-not-use-72f50dd4f1f871dd01cb0701f1de2694d5714a8f.tar.bz2
drakx-backup-do-not-use-72f50dd4f1f871dd01cb0701f1de2694d5714a8f.tar.xz
drakx-backup-do-not-use-72f50dd4f1f871dd01cb0701f1de2694d5714a8f.zip
report_bug: created, returns a string
-rw-r--r--perl-install/commands.pm21
1 files changed, 12 insertions, 9 deletions
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index e2d0f4c0d..46246aa2b 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -560,21 +560,14 @@ sub install_cpio($$;@) {
"$dir/$name";
}
-sub bug {
- my ($h) = getopts(\@_, "h");
- $h and die "usage: bug\nput file report.bug on fat formatted floppy\n";
-
- require detect_devices;
- mount devices::make(detect_devices::floppy()), "/fd0";
-
+sub report_bug {
sub header { "
********************************************************************************
* $_[0]
********************************************************************************";
}
- local $\ = "\n";
- output "/fd0/report.bug", map { chomp; $_ }
+ join '', map { chomp; "$_\n" }
header("lspci"), detect_devices::stringlist(),
header("pci_devices"), cat_("/proc/bus/pci/devices"),
header("fdisk"), `fdisk -l`,
@@ -590,6 +583,16 @@ sub bug {
header("ddebug.log"), cat_("/tmp/ddebug.log"),
header("install.log"), cat_("/mnt/root/install.log"),
;
+}
+
+sub bug {
+ my ($h) = getopts(\@_, "h");
+ $h and die "usage: bug\nput file report.bug on fat formatted floppy\n";
+
+ require detect_devices;
+ mount devices::make(detect_devices::floppy()), "/fd0";
+
+ output "/fd0/report.bug", report_bug();
umount "/fd0";
sync;
}