summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-12-17 19:04:52 +0000
committerOlivier Blin <oblin@mandriva.com>2008-12-17 19:04:52 +0000
commitfd93fc077796fde386555413b34a0caac4b6ea72 (patch)
tree7632fd74832fa968a6773b6f871350b16c6f2773
parentc7bd01533fd6bdd6616100769a491ca01d98fe6a (diff)
downloaddrakx-fd93fc077796fde386555413b34a0caac4b6ea72.tar
drakx-fd93fc077796fde386555413b34a0caac4b6ea72.tar.gz
drakx-fd93fc077796fde386555413b34a0caac4b6ea72.tar.bz2
drakx-fd93fc077796fde386555413b34a0caac4b6ea72.tar.xz
drakx-fd93fc077796fde386555413b34a0caac4b6ea72.zip
simplify
-rwxr-xr-xrescue/Flash/scripts/reset_userpass9
1 files changed, 2 insertions, 7 deletions
diff --git a/rescue/Flash/scripts/reset_userpass b/rescue/Flash/scripts/reset_userpass
index 471b7208b..d392ecd18 100755
--- a/rescue/Flash/scripts/reset_userpass
+++ b/rescue/Flash/scripts/reset_userpass
@@ -91,13 +91,8 @@ 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
+sys_loop="$rootdir$loopbacks_rel/system.loop"
+sfs_loop="$rootdir$loopbacks_rel/distrib.sqfs"
if ! prepare; then
cleanup