summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-09 14:45:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-09 14:45:30 +0000
commit32f330e38805bab5a46c57b6b5e9bfa992e2b033 (patch)
tree0332231ee4b40f85133f9772c576e7243f1698e2
parent8cad0151366e0af6966b296785f26179e417e4e2 (diff)
downloaddrakx-32f330e38805bab5a46c57b6b5e9bfa992e2b033.tar
drakx-32f330e38805bab5a46c57b6b5e9bfa992e2b033.tar.gz
drakx-32f330e38805bab5a46c57b6b5e9bfa992e2b033.tar.bz2
drakx-32f330e38805bab5a46c57b6b5e9bfa992e2b033.tar.xz
drakx-32f330e38805bab5a46c57b6b5e9bfa992e2b033.zip
handle "module xxx" lines in menu.lst (used for xen)
-rw-r--r--perl-install/bootloader.pm3
1 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 26ac4b59e..e585aba34 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -225,6 +225,8 @@ sub read_grub {
$e->{initrd} = grub2file($v, $grub2dev, $fstab);
} elsif ($keyword eq 'map') {
$e->{mapdrive}{$2} = $1 if $v =~ m/\((.*)\) \((.*)\)/;
+ } elsif ($keyword eq 'module') {
+ push @{$e->{modules}}, $v;
}
}
}
@@ -1349,6 +1351,7 @@ sub write_grub {
$_->{append},
if_($_->{'read-write'}, 'rw'),
if_($vga && $vga ne "normal", "vga=$vga"));
+ push @conf, "module " . $_ foreach @{$_->{modules} || []};
push @conf, "initrd " . $file2grub->($_->{initrd}) if $_->{initrd};
} else {
my $dev = eval { device_string2grub($_->{kernel_or_dev}, \@legacy_floppies, \@sorted_hds) };