diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2005-06-17 09:11:57 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2005-06-17 09:11:57 +0000 |
| commit | 53d5dee28c227151f51d90b718cfd74e974fbd2a (patch) | |
| tree | ac5f7593c8780556065e0f0aabc750ad4b64e255 | |
| parent | 69c557df98a69d40dd4615df31533ea1eea3d85a (diff) | |
| download | drakx-backup-do-not-use-53d5dee28c227151f51d90b718cfd74e974fbd2a.tar drakx-backup-do-not-use-53d5dee28c227151f51d90b718cfd74e974fbd2a.tar.gz drakx-backup-do-not-use-53d5dee28c227151f51d90b718cfd74e974fbd2a.tar.bz2 drakx-backup-do-not-use-53d5dee28c227151f51d90b718cfd74e974fbd2a.tar.xz drakx-backup-do-not-use-53d5dee28c227151f51d90b718cfd74e974fbd2a.zip | |
typo fix
| -rw-r--r-- | perl-install/bootloader.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index c4528656f..80bf67880 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1056,7 +1056,7 @@ sub write_lilo { push @conf, "# File generated by DrakX/drakboot"; push @conf, "# WARNING: do not forget to run lilo after modifying this file\n"; push @conf, "default=" . make_label_lilo_compatible($bootloader->{default}) if $bootloader->{default}; - my $root_uses_label = $bootloader->{root} =~ /$LABEL=/; + my $root_uses_label = $bootloader->{root} =~ /^LABEL=/; push @conf, map { "$_=$bootloader->{$_}" } grep { $bootloader->{$_} } qw(boot map install vga keytable raid-extra-boot), if_(!$root_uses_label, 'root'); push @conf, grep { $bootloader->{$_} } qw(linear geometric compact prompt nowarn restricted static-bios-codes); @@ -1078,7 +1078,7 @@ sub write_lilo { push @entry_conf, "label=" . make_label_lilo_compatible($entry->{label}); if ($entry->{type} eq "image") { - my $entry_root_uses_label = $entry->{root} =~ /$LABEL=/; + my $entry_root_uses_label = $entry->{root} =~ /^LABEL=/; push @entry_conf, "root=$entry->{root}" if $entry->{root} && !$entry_root_uses_label; push @entry_conf, "initrd=" . $file2fullname->($entry->{initrd}) if $entry->{initrd}; push @entry_conf, join('', qq(append="$entry->{append}), if_($entry_root_uses_label, "root=$entry->{root}"), '"') if $entry->{append} || $entry->{root}; |