summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-11-20 10:43:35 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-11-20 10:43:35 +0000
commitae7630b8d454e9ac59b4befbdda98cb440e68ee6 (patch)
tree4ed87bbe1ec989d49a66fa57a92233b9011f47e8 /perl-install
parent829760ee896dfda91ed493750edc43aa069ce5c8 (diff)
downloaddrakx-ae7630b8d454e9ac59b4befbdda98cb440e68ee6.tar
drakx-ae7630b8d454e9ac59b4befbdda98cb440e68ee6.tar.gz
drakx-ae7630b8d454e9ac59b4befbdda98cb440e68ee6.tar.bz2
drakx-ae7630b8d454e9ac59b4befbdda98cb440e68ee6.tar.xz
drakx-ae7630b8d454e9ac59b4befbdda98cb440e68ee6.zip
- 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)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/diskdrake/interactive.pm3
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index fac745479..48ab8933b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,7 @@
o fix garbaged error messages when umounting fs
o disallow "Use for loopback" when the partition used for loopback is
not formatted (#35535)
+ o always display the {info} field of the drive (not only in expert mode)
Version 10.5.3 - 9 November 2007, by Pascal "Pixel" Rigaux
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};