From d0b92b6eb207b2fd8282e60eb49c91a652c27e27 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 5 Jul 2007 15:03:11 +0000
Subject: use version-specific loopbacks relative path

---
 rescue/Flash/scripts/upgrade | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'rescue')

diff --git a/rescue/Flash/scripts/upgrade b/rescue/Flash/scripts/upgrade
index 1f5897ea4..f6d60bd34 100755
--- a/rescue/Flash/scripts/upgrade
+++ b/rescue/Flash/scripts/upgrade
@@ -174,13 +174,9 @@ if ! insert_pendrive; then
     exit 1
 fi
 
-if [ x"$version" = x"1.0" ]; then
-    sys_loop="$rootdir/loopbacks/system.loop"
-    sfs_loop="$rootdir/loopbacks/distrib.sqfs"
-else
-    sys_loop="$rootdir/.loopbacks/system.loop"
-    sfs_loop="$rootdir/.loopbacks/distrib.sqfs"
-fi
+#- works only when upgrading versions with the same layout
+sys_loop="$rootdir$loopbacks_rel/system.loop"
+sfs_loop="$rootdir$loopbacks_rel/distrib.sqfs"
 
 if ! prepare; then
     cleanup
-- 
cgit v1.2.1