diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install/install-image | 2 | ||||
| -rwxr-xr-x | scripts/install/install-image-existing | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/scripts/install/install-image b/scripts/install/install-image index fd10d0c3..1b482a19 100755 --- a/scripts/install/install-image +++ b/scripts/install/install-image @@ -123,7 +123,7 @@ fetch_iso_by_url () if [ $? -ne 0 ]; then echo "Signature check FAILED." echo -n "Do you want to continue anyway? (yes/no) [no] " - response=$(get_response "Yes" "Yes No Y N") + response=$(get_response "No" "Yes No Y N") if [ "$response" == "no" ] || [ "$response" == "n" ]; then fail_exit 'OK. Installation will not be performed.' fi diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing index f38e3701..4fdfeda2 100755 --- a/scripts/install/install-image-existing +++ b/scripts/install/install-image-existing @@ -203,8 +203,6 @@ fi 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 - # save current config dir if needed if [ $space_avail -gt $space_needed_configdata ]; then resp='' @@ -218,11 +216,12 @@ if [ $space_avail -gt $space_needed_configdata ]; then mkdir -p $ndir find $VYATTA_NEW_CFG_DIR -maxdepth 1 -mindepth 1 \ -exec cp '-a' '{}' "$ndir/" ';' + + # Set the upgraded flag + touch $ndir/.upgraded + chgrp -R vyattacfg $ndir chmod -R 775 $ndir - if [ -x $DEMO_MIGRATE_SCRIPT ]; then - $DEMO_MIGRATE_SCRIPT $ndir/config.boot - fi fi done else |