summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-12-17 19:04:28 +0000
committerOlivier Blin <oblin@mandriva.com>2008-12-17 19:04:28 +0000
commitc7bd01533fd6bdd6616100769a491ca01d98fe6a (patch)
tree4596765d01bc7e745d6a6deac3c57dd9df63afc3
parentdb1f2ac169681ade39af4d60c6c6043f4038dc49 (diff)
downloaddrakx-c7bd01533fd6bdd6616100769a491ca01d98fe6a.tar
drakx-c7bd01533fd6bdd6616100769a491ca01d98fe6a.tar.gz
drakx-c7bd01533fd6bdd6616100769a491ca01d98fe6a.tar.bz2
drakx-c7bd01533fd6bdd6616100769a491ca01d98fe6a.tar.xz
drakx-c7bd01533fd6bdd6616100769a491ca01d98fe6a.zip
simplify
-rwxr-xr-xrescue/Flash/scripts/reset_rootpass9
1 files changed, 2 insertions, 7 deletions
diff --git a/rescue/Flash/scripts/reset_rootpass b/rescue/Flash/scripts/reset_rootpass
index 7d1cb0431..dbbaf394f 100755
--- a/rescue/Flash/scripts/reset_rootpass
+++ b/rescue/Flash/scripts/reset_rootpass
@@ -80,13 +80,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