diff options
author | Olivier Blin <oblin@mandriva.com> | 2008-09-25 18:25:20 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2008-09-25 18:25:20 +0000 |
commit | 5436dc257ebec96aa002cd7c4080a9b5a017fe9e (patch) | |
tree | 854f398641ecf1380fe7a2a4632fd44cc28cdffb | |
parent | 8f3e77d8c3173184abfbba3cd7461fcc440c0cb2 (diff) | |
download | drakiso-5436dc257ebec96aa002cd7c4080a9b5a017fe9e.tar drakiso-5436dc257ebec96aa002cd7c4080a9b5a017fe9e.tar.gz drakiso-5436dc257ebec96aa002cd7c4080a9b5a017fe9e.tar.bz2 drakiso-5436dc257ebec96aa002cd7c4080a9b5a017fe9e.tar.xz drakiso-5436dc257ebec96aa002cd7c4080a9b5a017fe9e.zip |
pass media to grub functions
-rwxr-xr-x | draklive | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -747,11 +747,11 @@ sub build_grub_cfg { #- FIXME? first partition is hardcoded for loopback (master images) my ($part_nb) = $device =~ m!/dev/loop! ? 1 : $device =~ /(\d+)$/; my $initrd = get_initrd_path($media); - build_grub_cfg_raw($live, $initrd, $opts, $part_nb); + build_grub_cfg_raw($live, $media, $initrd, $opts, $part_nb); } sub build_grub_cfg_raw { - my ($live, $initrd, $opts, $part_nb) = @_; + my ($live, $media, $initrd, $opts, $part_nb) = @_; #- FIXME: use the bootloader module from drakx my $grub_part = "(hd0" . (defined $part_nb ? "," . ($part_nb-1) : "") . ")"; my $boot = get_media_prefix($live, 'boot'); #- FIXME handle boot media @@ -1199,7 +1199,7 @@ $live->{media}{title} <kernel options> sub create_classical_bootloader { my ($live) = @_; my $part_nb = 1; #- FIXME: get from partition layout config - output_p(get_system_root($live) . '/boot/grub/menu.lst', build_grub_cfg_raw($live, "/initrd.img", {}, $part_nb)); + output_p(get_system_root($live) . '/boot/grub/menu.lst', build_grub_cfg_raw($live, $live->{media}, "/initrd.img", {}, $part_nb)); } sub device_allocate_file { |