diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-04-09 20:14:56 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-04-09 20:14:56 +0000 |
| commit | 05e26a0ea74d05252fa1443d213f58493910b1a0 (patch) | |
| tree | 78244505b48855bf1c87749caea6676a41757361 | |
| parent | e895f62a7623d51ba0529b08d3c2abe4d2d2228a (diff) | |
| download | drakx-05e26a0ea74d05252fa1443d213f58493910b1a0.tar drakx-05e26a0ea74d05252fa1443d213f58493910b1a0.tar.gz drakx-05e26a0ea74d05252fa1443d213f58493910b1a0.tar.bz2 drakx-05e26a0ea74d05252fa1443d213f58493910b1a0.tar.xz drakx-05e26a0ea74d05252fa1443d213f58493910b1a0.zip | |
(install_grub): altconfigfile only if /boot is not reiserfs :-/
| -rw-r--r-- | perl-install/bootloader.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index f152e4be1..6bb970f33 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -707,9 +707,10 @@ sub install_grub { output "$prefix/boot/grub/device.map", join '', map { "($_) /dev/$bios2dev{$_}\n" } sort keys %bios2dev; } + my $bootIsReiser = isReiserfs(fsedit::get_root($fstab, 'boot')); my $file2grub = sub { my $file = expand_symlinks "$prefix$_[0]"; - if (!isReiserfs(fsedit::get_root($fstab, 'boot'))) { #- grub in reiserfs doesn't handle symlinks. + if (!$bootIsReiser) { #- grub in reiserfs doesn't handle symlinks. if (my $l = readlink "$prefix$_[0]") { $l =~ m|/| or $file =~ s/\Q$l/basename $_[0]/e; #- keep simple end symlinks } @@ -742,7 +743,8 @@ sub install_grub { print F "color black/cyan yellow/cyan"; print F "i18n ", $file2grub->("/boot/grub/messages"); print F "keytable ", $file2grub->($lilo->{keytable}) if $lilo->{keytable}; - print F "altconfigfile ", $file2grub->(my $once = "/boot/grub/menu.once"); + #- since we use notail in reiserfs, altconfigfile is broken :-( + print F "altconfigfile ", $file2grub->(my $once = "/boot/grub/menu.once") if !$bootIsReiser; output "$prefix$once", " " x 100; map_index { |