summaryrefslogtreecommitdiffstats
path: root/draklive
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-07-16 18:16:25 +0000
committerOlivier Blin <oblin@mandriva.com>2008-07-16 18:16:25 +0000
commit951ec10e88bfd85cd739f45cc2c536efc1f92a33 (patch)
treef516b59b57687762f9f53101c73ad9a85340caa6 /draklive
parent60a5b7d20207b7db3b68fa9f23cba2ddd2ec8539 (diff)
downloaddrakiso-951ec10e88bfd85cd739f45cc2c536efc1f92a33.tar
drakiso-951ec10e88bfd85cd739f45cc2c536efc1f92a33.tar.gz
drakiso-951ec10e88bfd85cd739f45cc2c536efc1f92a33.tar.bz2
drakiso-951ec10e88bfd85cd739f45cc2c536efc1f92a33.tar.xz
drakiso-951ec10e88bfd85cd739f45cc2c536efc1f92a33.zip
extract build_grub_cfg_raw
Diffstat (limited to 'draklive')
-rwxr-xr-xdraklive10
1 files changed, 8 insertions, 2 deletions
diff --git a/draklive b/draklive
index eae79c9..b1abdca 100755
--- a/draklive
+++ b/draklive
@@ -710,8 +710,14 @@ sub build_syslinux_cfg {
sub build_grub_cfg {
my ($live, $media, $device) = @_;
- #- FIXME: use the bootloader module from drakx
my ($part_nb) = $device =~ /(\d+)$/;
+ my $initrd = get_initrd_path($media);
+ build_grub_cfg_raw($live, $initrd, $part_nb);
+}
+
+sub build_grub_cfg_raw {
+ my ($live, $initrd, $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
join("\n",
@@ -722,7 +728,7 @@ sub build_grub_cfg {
my ($name, $cmdline) = @$_;
"title " . $live->{media}{title} . if_($name, " ($name)"),
"kernel $grub_part" . $boot . "/vmlinuz " . get_default_append($live) . if_($cmdline, " $cmdline"),
- "initrd " . $boot . get_initrd_path($media);
+ "initrd " . $boot . $initrd;
} group_by2('' => '', @{$live->{system}{boot_entries}})),
"",
);