diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-06-24 10:39:55 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-06-24 10:39:55 +0000 |
commit | e6cc29951c4bad7f62621ce07c8b394e7e709cb8 (patch) | |
tree | a691e6c2d480874bb5206e8ed1f7547c3465f6ec | |
parent | 6e304d54d7c7fcc7d89fda21addbdcbb21e8993d (diff) | |
download | drakx-e6cc29951c4bad7f62621ce07c8b394e7e709cb8.tar drakx-e6cc29951c4bad7f62621ce07c8b394e7e709cb8.tar.gz drakx-e6cc29951c4bad7f62621ce07c8b394e7e709cb8.tar.bz2 drakx-e6cc29951c4bad7f62621ce07c8b394e7e709cb8.tar.xz drakx-e6cc29951c4bad7f62621ce07c8b394e7e709cb8.zip |
(grub2dev)
- remove dead code
- enhance comment
-rw-r--r-- | perl-install/bootloader.pm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 6f10bf77c..a029f099a 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1029,9 +1029,8 @@ sub grub2dev { my ($device, $o_block_device) = @_; my ($dev, $part) = ($1 . ")", $2) if $device =~ s/(\([^,]*?)(?:,(.*))?\)//; undef $part if $o_block_device; - $part++ if defined $part; # grub wants "(hdX,Y)" where lilo just want "hdX" + $part++ if defined $part; # grub wants "(hdX,Y)" where lilo just want "hdY+1" $dev =~ s/,[^)]*//; - my %h = map { chomp; s/()//g; split(/\s+/, $_, 2) } cat_("$::prefix/boot/grub/device.map"); my $new_dev = +{ map { chomp; s/()//g; split(/\s+/, $_, 2) } cat_("$::prefix/boot/grub/device.map") }->{$dev} . $part; wantarray() ? ($device, $new_dev) : $new_dev; } |