diff options
Diffstat (limited to 'scripts/install/install-image-existing')
| -rwxr-xr-x | scripts/install/install-image-existing | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing index d75a62b6..7c75b35b 100755 --- a/scripts/install/install-image-existing +++ b/scripts/install/install-image-existing @@ -175,12 +175,12 @@ fi # Check to make sure we have enough space to copy the config and data dirs... # space_avail=`df -k / | tail -1 | awk '{ print $4 }'` -if [ -e $${VYATTA_CFG_DIR}/data ]; then - space_needed_data=`du -s ${VYATTA_CFG_DIR}/data | awk '{ print $1 }'` +if [ -e $${VYATTA_NEW_CFG_DIR}/data ]; then + space_needed_data=`du -s ${VYATTA_NEW_CFG_DIR}/data | awk '{ print $1 }'` else space_needed_data=0 fi -space_needed_configdata=`du -s ${VYATTA_CFG_DIR} | awk '{ print $1 }'` +space_needed_configdata=`du -s ${VYATTA_NEW_CFG_DIR} | awk '{ print $1 }'` space_needed_config=$(($space_needed_configdata - $space_needed_data)) DEMO_MIGRATE_SCRIPT=/opt/vyatta/sbin/demo-to-vse.pl @@ -194,9 +194,9 @@ if [ $space_avail -gt $space_needed_configdata ]; then resp=$(get_response "Yes" "Yes No Y N") if [ "$resp" == 'yes' ] || [ "$resp" == 'y' ]; then echo 'Copying current configuration...' - ndir=${INST_ROOT}/config + ndir=${INST_ROOT}/${VYATTA_NEW_CFG_DIR} mkdir -p $ndir - find $VYATTA_CFG_DIR -maxdepth 1 -mindepth 1 \ + find $VYATTA_NEW_CFG_DIR -maxdepth 1 -mindepth 1 \ -exec cp '-a' '{}' "$ndir/" ';' chgrp -R vyattacfg $ndir chmod -R 775 $ndir |