From 0d218f0043747261c7f45c143bc10c79a865e22a Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 17 Feb 2006 16:20:42 +0000
Subject: fix errors from previous commit

---
 tools/draklive | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'tools')

diff --git a/tools/draklive b/tools/draklive
index 473cf5b03..589056c35 100755
--- a/tools/draklive
+++ b/tools/draklive
@@ -788,8 +788,17 @@ sub copy_wizard {
 sub complete_config {
     my ($live) = @_;
 
+    my $default_prefix = {
+        media_mnt => '/media',
+        live_mnt => '/live',
+        loopbacks => '/loopbacks',
+        images => '/images',
+        boot => '/boot',
+        initrd => '/initrd',
+    };
+
     if ($live->{copy_wizard}) {
-        add2hash($live{prefix} ||= {}, $default_prefix);
+        add2hash($live->{prefix} ||= {}, $default_prefix);
         #- assumes the current live media is mounted there
         $live->{workdir} = $live->{prefix}{live_mnt} . $live->{prefix}{media_mnt};
         $live->{mnt} = '/tmp/mnt';
@@ -804,7 +813,7 @@ sub complete_config {
         $live->{system}{kernel} or die "no kernel has been configured";
         mkdir_p(get_workdir($live));
 
-        add2hash($live{prefix} ||= {}, $default_prefix);
+        add2hash($live->{prefix} ||= {}, $default_prefix);
     }
 }
 
@@ -813,15 +822,6 @@ sub clean {
     rm_rf($_) foreach grep { -e $_ } get_workdir($live), get_system_root($live);
 }
 
-my $default_prefix = {
-    media_mnt => '/media',
-    live_mnt => '/live',
-    loopbacks => '/loopbacks',
-    images => '/images',
-    boot => '/boot',
-    initrd => '/initrd',
-};
-
 my @actions = (
     { name => 'clean', do => \&clean },
     { name => 'install', do => \&install_system },
-- 
cgit v1.2.1