summaryrefslogtreecommitdiffstats
path: root/draklive
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-11-09 11:11:42 +0000
committerOlivier Blin <oblin@mandriva.com>2009-11-09 11:11:42 +0000
commitad78be110f7bc35b2b3bc92fb998c6c883a7b7f7 (patch)
tree6df3e3f0db852fde100c4cc59f092158cddcb987 /draklive
parent282845a0ac0af992144d2ba3b42d5ea5820d6c9f (diff)
downloaddrakiso-ad78be110f7bc35b2b3bc92fb998c6c883a7b7f7.tar
drakiso-ad78be110f7bc35b2b3bc92fb998c6c883a7b7f7.tar.gz
drakiso-ad78be110f7bc35b2b3bc92fb998c6c883a7b7f7.tar.bz2
drakiso-ad78be110f7bc35b2b3bc92fb998c6c883a7b7f7.tar.xz
drakiso-ad78be110f7bc35b2b3bc92fb998c6c883a7b7f7.zip
make find_kernel return a hash like used in bootloader module
Diffstat (limited to 'draklive')
-rwxr-xr-xdraklive4
1 files changed, 2 insertions, 2 deletions
diff --git a/draklive b/draklive
index e131eb4..4ac770e 100755
--- a/draklive
+++ b/draklive
@@ -485,7 +485,7 @@ sub create_initrd {
sub create_bootloader {
my ($live) = @_;
- my $kernel = $live->find_kernel;
+ my $kernel = $live->find_kernel->{version};
my $vmlinuz_long = '/boot/vmlinuz-' . $kernel;
-e $live->get_system_root . $vmlinuz_long or die "can not find kernel $kernel\n";
@@ -588,7 +588,7 @@ $live->{media}{title} <kernel options>
sub create_media_bootloader {
my ($live) = @_;
- cp_f($live->get_system_root . '/boot/vmlinuz-' . $live->find_kernel, $live->get_builddir . $live->{prefix}{build}{boot} . '/vmlinuz');
+ cp_f($live->get_system_root . '/boot/vmlinuz-' . $live->find_kernel->{version}, $live->get_builddir . $live->{prefix}{build}{boot} . '/vmlinuz');
foreach my $boot ('', @{$live->{media}{extra_boot}}) {
my $opts = { boot => $boot };
output($live->get_builddir . $live->{prefix}{build}{boot} . get_syslinux_path($live->{media}, $opts),