From ae2a09cf9f6899d5526d56ed92b3091c14a6d153 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 26 May 2009 18:54:22 +0000
Subject: fix previous commit to update /boot/vmlinuz correctly

---
 lib/MDV/Draklive/Initrd.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/MDV')

diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm
index 4147a90..c02fa5b 100644
--- a/lib/MDV/Draklive/Initrd.pm
+++ b/lib/MDV/Draklive/Initrd.pm
@@ -266,17 +266,19 @@ sub add_splash {
 
 sub create_classical_initrd {
     my ($live) = @_;
+    my $root = $live->get_system_root;
     my $kernel = $live->find_kernel;
     #- FIXME: use bootloader-config and allow it not to require a bootloader?
     print "using kernel $kernel\n";
+
+    my $vmlinuz_long = '/boot/vmlinuz-' . $kernel;
+    my $vmlinuz_short = '/boot/vmlinuz';
     symlinkf(basename($vmlinuz_long), $root . $vmlinuz_short);
+
     $live->{system}{no_initrd} and return;
 
     my $initrd_long = '/boot/initrd-'. $kernel . '.img';
     my $initrd_short = '/boot/initrd.img';
-    my $vmlinuz_long = '/boot/vmlinuz-' . $kernel;
-    my $vmlinuz_short = '/boot/vmlinuz';
-    my $root = $live->get_system_root;
     run_({}, 'mount', '-t', 'proc', '/proc', $root . '/proc');
     run_({}, 'mount', '-t', 'sysfs', '/sys', $root . '/sys');
     run_({ root => $root }, 'mkinitrd', '-v', '-f', $initrd_long, $kernel);
-- 
cgit v1.2.1