From 75119f34cf95cfd1d9d64bf6e1c8420781d7083e Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 22 Dec 2020 15:29:46 +0000
Subject: 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.
---
 perl-install/NEWS                     | 2 ++
 perl-install/diskdrake/interactive.pm | 2 ++
 perl-install/install/NEWS             | 2 ++
 3 files changed, 6 insertions(+)

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
-- 
cgit v1.2.1