summaryrefslogtreecommitdiffstats
path: root/perl-install/diskdrake
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 /perl-install/diskdrake
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.
Diffstat (limited to 'perl-install/diskdrake')
-rw-r--r--perl-install/diskdrake/interactive.pm2
1 files changed, 2 insertions, 0 deletions
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;
}