From ae7630b8d454e9ac59b4befbdda98cb440e68ee6 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 20 Nov 2007 10:43:35 +0000 Subject: - diskdrake: o always display the {info} field of the drive (not only in expert mode) TODO: understand why titi sets the {info} field using the "serial" of the device, it seems quite ugly on a test here. (was introduced in detect_devices.pm, r214435) --- perl-install/diskdrake/interactive.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'perl-install/diskdrake') diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index e5c79a8a7..fa887949f 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -1298,7 +1298,8 @@ sub format_hd_info { $info .= N("Read-only") . "\n" if $hd->{readonly}; $info .= N("Size: %s\n", formatXiB($hd->{totalsectors}, 512)) if $hd->{totalsectors}; $info .= N("Geometry: %s cylinders, %s heads, %s sectors\n", $hd->{geom}{cylinders}, $hd->{geom}{heads}, $hd->{geom}{sectors}) if $::expert && $hd->{geom}; - $info .= N("Info: ") . ($hd->{info} || $hd->{media_type}) . "\n" if $::expert && ($hd->{info} || $hd->{media_type}); + $info .= N("Name: ") . $hd->{info} . "\n" if $hd->{info}; + $info .= N("Medium type: ") . $hd->{media_type} . "\n" if $hd->{media_type} && $::expert; $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}; -- cgit v1.2.1