diff options
-rwxr-xr-x | draklive | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -742,15 +742,15 @@ sub build_syslinux_cfg { } sub build_grub_cfg { - my ($live, $media, $device) = @_; + my ($live, $media, $opts, $device) = @_; #- 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, $part_nb); + build_grub_cfg_raw($live, $initrd, $opts, $part_nb); } sub build_grub_cfg_raw { - my ($live, $initrd, $part_nb) = @_; + my ($live, $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 @@ -1198,7 +1198,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, "/initrd.img", $opts, $part_nb)); } sub device_allocate_file { @@ -1439,7 +1439,7 @@ sub install_usb_bootloader { # and get_bootloader_path (when copying) mkdir_p($live->{mnt} . $media_boot . '/grub'); cp_f(get_builddir($live) . $live->{prefix}{build}{boot} . '/gfxmenu', $live->{mnt} . $media_boot); - output_p($live->{mnt} . $media_boot . '/grub/menu.lst', build_grub_cfg($live, $media, $device)); + output_p($live->{mnt} . $media_boot . '/grub/menu.lst', build_grub_cfg($live, $media, $opts, $device)); unlink $grub_device_map; } |