summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2021-01-11 12:29:59 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2021-01-11 12:29:59 +0000
commit847f792f9e3acb53c23700c669c30b2e0e7f2b5c (patch)
treec8d597f921bc52596e3f0cb313b2181e25b96096 /perl-install
parent8da35bee0da6d6b5074941f598a15ab1031d4250 (diff)
downloaddrakx-847f792f9e3acb53c23700c669c30b2e0e7f2b5c.tar
drakx-847f792f9e3acb53c23700c669c30b2e0e7f2b5c.tar.gz
drakx-847f792f9e3acb53c23700c669c30b2e0e7f2b5c.tar.bz2
drakx-847f792f9e3acb53c23700c669c30b2e0e7f2b5c.tar.xz
drakx-847f792f9e3acb53c23700c669c30b2e0e7f2b5c.zip
drakbug_report: fail quietly when trying journalctl for system log.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/any.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e9cdf5ff2..392be5661 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- drakbug_report:
+ o fail quietly when trying journalctl for system log
- fix handling of TYPE"64bit" flags when reading rpmsrate
- Fix syntax of 51-mageia-resume.conf (mga#28055)
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 2fdf15902..f2bb1c6d1 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1487,7 +1487,7 @@ sub report_bug {
header("dmsetup table"), `dmsetup table`,
header("dmsetup ls"), `dmsetup ls`,
header("cpuinfo"), cat_("/proc/cpuinfo"),
- header("syslog"), cat_("/tmp/syslog") || cat_("$::prefix/var/log/syslog") || `journalctl -D $::prefix/var/log/journal -b`,
+ header("syslog"), cat_("/tmp/syslog") || cat_("$::prefix/var/log/syslog") || `journalctl -q -D $::prefix/var/log/journal -b`,
header("Xorg.log"), cat_("/var/log/Xorg.0.log"),
header("monitor_full_edid"), monitor_full_edid(),
header("stage1.log"), cat_("/tmp/stage1.log") || cat_("$::prefix/root/drakx/stage1.log"),