diff options
| -rwxr-xr-x | draklive | 35 |
1 files changed, 27 insertions, 8 deletions
@@ -705,16 +705,35 @@ sub record_cdrom_master { sub install_grub_to_image { my ($live, $img) = @_; - cp_af(glob_($live->get_system_root . "/lib/grub/i386-mandriva/*"), $live->{mnt} . "/boot/grub"); - open(my $grub, "| /sbin/grub --batch --no-floppy"); - # using disk loopback fails, have to use image path - print $grub <<EOF; -device (hd0) $img + my $grub_dir = "/boot/grub"; + my $grub_script = $grub_dir . "/install.sh"; + my $grub_device_map = $grub_dir . "/device.map"; + cp_af(glob_($live->get_system_root . "/lib/grub/i386-mandriva/*"), $live->{mnt} . $grub_dir); + + output($live->{mnt} . $grub_script, <<EOG); +grub --device-map=/boot/grub/device.map --batch <<EOF root (hd0,0) -setup (hd0) +setup --stage2=/boot/grub/stage2 (hd0) +quit EOF - close ($grub) or die "unable to run grub\n"; - print "\n"; +EOG + + my $hd_tmp = !-b $img && "/tmp/hd0.img"; + if ($hd_tmp) { + touch($live->{mnt} . $hd_tmp); + run_("mount", "--bind", $img, $live->{mnt} . $hd_tmp); + } + my $hd0 = $hd_tmp || $img; + + # using disk loopback fails, have to use image path + output($live->{mnt} . $grub_device_map, "(hd0) $hd0"); + run_({ root => $live->{mnt} }, $grub_script); + unlink $live->{mnt} . $grub_device_map; + + if ($hd_tmp) { + run_("umount", $live->{mnt} . $hd_tmp); + unlink $live->{mnt} . $hd_tmp; + } } sub install_usb_bootloader { |