diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-06-18 00:03:30 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-06-18 00:03:30 +0000 |
| commit | 0436887d754dd93bf5f95a2fb4e33cd66350a010 (patch) | |
| tree | 9a5ec4918328b254600b4c1bf6ede290c46e57a1 /perl-install/bootloader.pm | |
| parent | ab0dd0bc41cf02b176d2d2735b738f7e4fa92f76 (diff) | |
| download | drakx-backup-do-not-use-0436887d754dd93bf5f95a2fb4e33cd66350a010.tar drakx-backup-do-not-use-0436887d754dd93bf5f95a2fb4e33cd66350a010.tar.gz drakx-backup-do-not-use-0436887d754dd93bf5f95a2fb4e33cd66350a010.tar.bz2 drakx-backup-do-not-use-0436887d754dd93bf5f95a2fb4e33cd66350a010.tar.xz drakx-backup-do-not-use-0436887d754dd93bf5f95a2fb4e33cd66350a010.zip | |
rollback titi's commit (it was needed with 10.2 code, but i've already committed code to handle it cleanly in cooker (see $quotes_if_needed))
Diffstat (limited to 'perl-install/bootloader.pm')
| -rw-r--r-- | perl-install/bootloader.pm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index dc59b1047..67ab14c00 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1086,10 +1086,9 @@ 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=/; - push @conf, map { $_ . '=' . $quotes_if_needed->($bootloader->{$_}) } grep { $bootloader->{$_} } qw(boot map install vga keytable raid-extra-boot menu-scheme), if_(!$root_uses_label, 'root'); + push @conf, map { $_ . '=' . $quotes_if_needed->($bootloader->{$_}) } grep { $bootloader->{$_} } qw(boot root map install vga keytable raid-extra-boot menu-scheme); push @conf, grep { $bootloader->{$_} } qw(linear geometric compact prompt nowarn restricted static-bios-codes); - push @conf, qq(append="$bootloader->{append}), if_($root_uses_label, "root=$bootloader->{root}"), '"' if $bootloader->{append} || $root_uses_label; + push @conf, qq(append="$bootloader->{append}") if $bootloader->{append}; push @conf, "password=" . $bootloader->{password} if $bootloader->{password}; #- also done by msec push @conf, "timeout=" . round(10 * $bootloader->{timeout}) if $bootloader->{timeout}; push @conf, "serial=" . $1 if get_append_with_key($bootloader, 'console') =~ /ttyS(.*)/; @@ -1106,10 +1105,9 @@ sub write_lilo { push @entry_conf, "label=" . make_label_lilo_compatible($entry->{label}) if $entry->{label}; if ($entry->{type} eq "image") { - my $entry_root_uses_label = $entry->{root} =~ /^LABEL=/; - push @entry_conf, 'root=' . $quotes_if_needed->($entry->{root}) if $entry->{root} && !$entry_root_uses_label; + push @entry_conf, 'root=' . $quotes_if_needed->($entry->{root}) if $entry->{root}; 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}; + push @entry_conf, qq(append="$entry->{append}") if $entry->{append}; push @entry_conf, "vga=$entry->{vga}" if $entry->{vga}; push @entry_conf, grep { $entry->{$_} } qw(read-write read-only optional); } else { |