ask to attach blkid output when debugging a boot issue

2 files changed, 17 insertions, 1 deletions

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 971e41703..f70e63c05 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,10 +1,13 @@
 - drakbug:
+  o ask to attach blkid output when debugging a boot issue
   o do not ask to include kernel version & /proc/cpuinfo since this is
     done automatically
  o request to attach lspcidrake's output rather than include it
    (smaller descriptions)
 - diskdrake:
   o --smb: fix netbios name resolution (#42483, thanks to Derek Jennings)
+- scannerdrake:
+  o fix a crash when installing firmware (#40738)
 
 Version 11.77 - 15 January 2008
 
diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index 7c414e79d..d8573d681 100755
--- a/perl-install/standalone/drakbug
+++ b/perl-install/standalone/drakbug
@@ -122,11 +122,19 @@ $table = create_packtable({ col_spacings => 5, row_spacings => 10 },
 $comb_app->set_popdown_strings("", uniq(sort(@generic_tool), if_($prog, $prog)));
 $comb_app->set_text("");
 
+sub is_a_boot_issue() {
+    $prog =~ /boot|mkinitrd/;
+}
+
 sub format_trace_with_message {
     my ($message, $trace) = @_;
     ([ $message ], [ "\n\n  " . join("\n  ", split("\n", $trace)) . "\n\n", { family => 'monospace' }]);
 }
 
+my @commands = 'lspcidrake -v';
+
+push @commands, 'blkid' if is_a_boot_issue();
+
 my $parent_uid = get_parent_uid();
 
 my $width = 600;
@@ -147,7 +155,12 @@ gtkadd($window->{window},
                                    if_($gdb_trace, format_trace_with_message(N("Its gdb trace is:"), $gdb_trace)),
                                ),
                                [
-                                   N("To submit a bug report, click on the report button.  \nThis will open a web browser window on %s where you'll find a form to fill in.  The information displayed above will be transferred to that server.  \nThings useful to attach to your report are the output of lspcidrake -v.", $wizard_name)
+                                   N("To submit a bug report, click on the report button.  \nThis will open a web browser window on %s where you'll find a form to fill in.  The information displayed above will be transferred to that server",
+                                     $wizard_name).  "\n" .
+                                       P("It would be very useful to attach to your report the output of the following command: %s.",
+                                         "Things useful to attach to your report are the output of the following commands: %s.",
+                                         scalar(@commands),
+                                         join(", ", map { N("'%s'", $_) } @commands))
                                ]
                            ])),
                 0, gtknew('Title2', label => N("Please describe what you were doing when it crashed:"), width => $width),