diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-10-03 09:29:31 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-10-03 09:29:31 +0000 |
| commit | bd317178bee57d9a917ee171f34b48dbdd235423 (patch) | |
| tree | cd73b776a2dfda038f8bc2f1d82d27f10f610238 | |
| parent | fa563a3fa13b8b234ad1e6f9bd02727fd39c02c2 (diff) | |
| download | drakx-backup-do-not-use-bd317178bee57d9a917ee171f34b48dbdd235423.tar drakx-backup-do-not-use-bd317178bee57d9a917ee171f34b48dbdd235423.tar.gz drakx-backup-do-not-use-bd317178bee57d9a917ee171f34b48dbdd235423.tar.bz2 drakx-backup-do-not-use-bd317178bee57d9a917ee171f34b48dbdd235423.tar.xz drakx-backup-do-not-use-bd317178bee57d9a917ee171f34b48dbdd235423.zip | |
- bootloader:
o if there is a /boot, check /boot instead of "/" to allow grub or not
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index a175cd321..d29680975 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- drakboot --boot: + o if there is a /boot, check /boot instead of "/" to allow grub or not + Version 10.4.226 - 2 October 2007, by Thierry Vignaud - drakauth: diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 5e311e348..ae99ad69f 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1054,11 +1054,12 @@ sub method_choices { my ($all_hds, $b_prefix_mounted) = @_; my $fstab = [ fs::get::fstab($all_hds) ]; my $root_part = fs::get::root($fstab); + my $boot_part = fs::get::root($fstab, 'boot'); my $have_dmraid = find { fs::type::is_dmraid($_) } @{$all_hds->{hds}}; grep { !(/lilo/ && (isLoopback($root_part) || $have_dmraid)) - && !(/grub/ && isRAID($root_part)) + && !(/grub/ && isRAID($boot_part)) && !(/grub-graphic/ && cat_("/proc/cmdline") =~ /console=ttyS/); } method_choices_raw($b_prefix_mounted); } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 75ae92b76..6a25fc227 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- bootloader: + o if there is a /boot, check /boot instead of "/" to allow grub or not + Version 10.4.227 - 2 October 2007, by Thierry Vignaud - diskdrake: |