summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-12-22 15:29:46 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-12-22 15:29:46 +0000
commit75119f34cf95cfd1d9d64bf6e1c8420781d7083e (patch)
tree40e50052e758ffb7399f15f953134d7ee803de72
parent4607308b34f7f5fe26131587c87c5aa820e2bc6c (diff)
downloaddrakx-75119f34cf95cfd1d9d64bf6e1c8420781d7083e.tar
drakx-75119f34cf95cfd1d9d64bf6e1c8420781d7083e.tar.gz
drakx-75119f34cf95cfd1d9d64bf6e1c8420781d7083e.tar.bz2
drakx-75119f34cf95cfd1d9d64bf6e1c8420781d7083e.tar.xz
drakx-75119f34cf95cfd1d9d64bf6e1c8420781d7083e.zip
diskdrake: restrict line length when displaying base device info.
This prevents the window extending off screen (mga#27882). Matches what was already done when displaying partition info.
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/diskdrake/interactive.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 20d64fdd7..a0e422b47 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,8 @@
- diskdrake:
o fix adding parts to extended partition on hybrid ISO (mga#27862)
o erase iso9660 signature when clearing hybrid ISO disk (mga#27864)
+ o restrict line length when displaying base device info
+ to avoid excessive window expansion (mga#27882)
- drakbug_report:
o also try journalctl for system log
o include draklive-install.log
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 45b830cc1..59e79782c 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -1493,6 +1493,8 @@ sub format_hd_info {
$info .= N("LVM-disks %s\n", join ", ", map { $_->{device} } @{$hd->{disks}}) if isLVM($hd) && $hd->{disks};
$info .= N("Partition table type: %s\n", $1) if $::expert && ref($hd) =~ /_([^_]+)$/;
$info .= N("on channel %d id %d\n", $hd->{channel}, $hd->{id}) if $::expert && exists $hd->{channel};
+ # restrict the length of the lines
+ $info =~ s/(.{60}).*/$1.../mg;
$info;
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 44afbbb3b..c52159ba6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -4,6 +4,8 @@
o add option to configure rEFInd to not use EFI NVRAM (mga#27838)
- partitioning:
o erase iso9660 signature when clearing hybrid ISO disk (mga#27864)
+ o restrict line length when displaying base device info
+ to prevent window extending off screen (mga#27882)
- support https in media URL (mga#27776)
Version 18.37 - 5 December 2020