summaryrefslogtreecommitdiffstats
path: root/rescue/Flash/scripts/upgrade
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-07-06 12:57:56 +0000
committerOlivier Blin <oblin@mandriva.com>2007-07-06 12:57:56 +0000
commitb2afa7ebaa987780a6420af2408c718c2447fbec (patch)
tree0a08e139d6deed0b3984173d8c010545463f0915 /rescue/Flash/scripts/upgrade
parent625eebd3af529b7cb144a4c16c6a7121be61d24b (diff)
downloaddrakx-b2afa7ebaa987780a6420af2408c718c2447fbec.tar
drakx-b2afa7ebaa987780a6420af2408c718c2447fbec.tar.gz
drakx-b2afa7ebaa987780a6420af2408c718c2447fbec.tar.bz2
drakx-b2afa7ebaa987780a6420af2408c718c2447fbec.tar.xz
drakx-b2afa7ebaa987780a6420af2408c718c2447fbec.zip
don't hardcode upgrade.merge-users path
Diffstat (limited to 'rescue/Flash/scripts/upgrade')
-rwxr-xr-xrescue/Flash/scripts/upgrade2
1 files changed, 1 insertions, 1 deletions
diff --git a/rescue/Flash/scripts/upgrade b/rescue/Flash/scripts/upgrade
index 2f6f0f423..736091365 100755
--- a/rescue/Flash/scripts/upgrade
+++ b/rescue/Flash/scripts/upgrade
@@ -163,7 +163,7 @@ function merge_config_files() {
return 1
fi
- ./upgrade.merge-users $tmpdir/user/etc $tmpdir/squash/etc
+ upgrade.merge-users $tmpdir/user/etc $tmpdir/squash/etc
return 0
}