1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 00:07:11 +02:00

backport scripts/env init fix from r22336

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22337 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2010-07-21 17:50:18 +00:00
parent ba36298f89
commit 5dba542b5a

View File

@ -192,7 +192,8 @@ env_new() {
if [ -f "$BASEDIR/.config" -o -d "$BASEDIR/files" ]; then
if ask_bool 1 "Do you want to keep your current config and files?"; then
[ -d "$BASEDIR/files" -a \! -L "$BASEDIR/files" ] && {
mv "$BASEDIR/files/"* "$ENVDIR/" 2>/dev/null
mkdir -p "$ENVDIR/files"
mv "$BASEDIR/files/*" "$ENVDIR/files/" 2>/dev/null
rmdir "$BASEDIR/files"
}
env_sync