diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-10-02 16:35:49 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-10-02 16:35:49 +0200 |
| commit | 617edfd77a69daa9d1df4754f38dbc5b3a9a639d (patch) | |
| tree | b6b9e054022c6e0d7c09f0edc74c651d23e2d6dc | |
| parent | f08602e01ab23e534e27776f59b831a8e936cca5 (diff) | |
| parent | b90c59b269a581d54f6317ef336f7be877eca649 (diff) | |
| download | vyatta-cfg-system-617edfd77a69daa9d1df4754f38dbc5b3a9a639d.tar.gz vyatta-cfg-system-617edfd77a69daa9d1df4754f38dbc5b3a9a639d.zip | |
Merge branch 'current' into crux
| -rwxr-xr-x | scripts/install/install-image-existing | 9 |
1 files changed, 4 insertions, 5 deletions
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 |